RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavutil/opt: fix memory leak after av_dict_parse_string fail 

In case of failure, all the successfully set entries are stored in
*pm. We need to manually free the created dictionary to avoid
memory leak.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
This commit is contained in:
Jun Zhao 2020-01-01 12:35:31 +08:00
parent c8e72a6494
commit 3c8da7b982
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/opt.c
View File

@ -452,8 +452,10 @@ static int set_string_dict(void *obj, const AVOption *o, const char *val, uint8_
if (val) {
int ret = av_dict_parse_string(&options, val, "=", ":", 0);
if (ret < 0)
if (ret < 0) {
av_dict_free(&options);
return ret;
}
}
av_dict_free((AVDictionary **)dst);
@ -2006,8 +2008,10 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o)
AVDictionaryEntry *en1 = NULL;
AVDictionaryEntry *en2 = NULL;
ret = av_dict_parse_string(&dict1, o->default_val.str, "=", ":", 0);
if (ret < 0)
if (ret < 0) {
av_dict_free(&dict1);
return ret;
}
do {
en1 = av_dict_get(dict1, "", en1, AV_DICT_IGNORE_SUFFIX);
en2 = av_dict_get(dict2, "", en2, AV_DICT_IGNORE_SUFFIX);