Commit 2dbeba48 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

concat: prevent infinite recursion

parent e8ee1c23
...@@ -214,7 +214,7 @@ static int Open(vlc_object_t *obj) ...@@ -214,7 +214,7 @@ static int Open(vlc_object_t *obj)
{ {
access_t *access = (access_t *)obj; access_t *access = (access_t *)obj;
char *list = var_InheritString(access, "concat-list"); char *list = var_CreateGetNonEmptyString(access, "concat-list");
if (list == NULL) if (list == NULL)
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -225,6 +225,8 @@ static int Open(vlc_object_t *obj) ...@@ -225,6 +225,8 @@ static int Open(vlc_object_t *obj)
return VLC_ENOMEM; return VLC_ENOMEM;
} }
var_SetString(access, "concat-list", ""); /* prevent recursion */
bool read_cb = true; bool read_cb = true;
sys->access = NULL; sys->access = NULL;
...@@ -318,6 +320,7 @@ static void Close(vlc_object_t *obj) ...@@ -318,6 +320,7 @@ static void Close(vlc_object_t *obj)
free(e); free(e);
} }
var_Destroy(access, "concat-list");
free(sys); free(sys);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment