RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

loadfile: fix leak due to setting NULL parent 

in the first iteration, *out will be null and thus the steal and the
strdup both sets the parent to NULL - leaking the allocation later on
(caught via LeakSanitizer).

let append_lang() take care of setting the parent instead.
This commit is contained in:
NRK 2023-06-28 04:16:48 +06:00 committed by rcombs
parent f8cb539e6f
commit 2f220c6286
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
player/loadfile.c
View File

@ -544,6 +544,7 @@ static bool append_lang(size_t *nb, char ***out, char *in)
MP_TARRAY_GROW(NULL, *out, *nb + 1);
(*out)[(*nb)++] = in;
(*out)[*nb] = NULL;
ta_set_parent(in, *out);
return true;
}
@ -552,7 +553,7 @@ static bool add_auto_langs(size_t *nb, char ***out)
bool ret = false;
char **autos = mp_get_user_langs();
for (int i = 0; autos && autos[i]; i++) {
if (!append_lang(nb, out, talloc_steal(*out, autos[i])))
if (!append_lang(nb, out, autos[i]))
goto cleanup;
}
ret = true;
@ -571,7 +572,7 @@ static char **process_langs(char **in)
if (!add_auto_langs(&nb, &out))
break;
} else {
if (!append_lang(&nb, &out, talloc_strdup(out, in[i])))
if (!append_lang(&nb, &out, talloc_strdup(NULL, in[i])))
break;
}
}