Commit 3c8da7b9 authored by Jun Zhao's avatar Jun Zhao

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: 's avatarJun Zhao <barryjzhao@tencent.com>
parent c8e72a64
...@@ -452,8 +452,10 @@ static int set_string_dict(void *obj, const AVOption *o, const char *val, uint8_ ...@@ -452,8 +452,10 @@ static int set_string_dict(void *obj, const AVOption *o, const char *val, uint8_
if (val) { if (val) {
int ret = av_dict_parse_string(&options, val, "=", ":", 0); int ret = av_dict_parse_string(&options, val, "=", ":", 0);
if (ret < 0) if (ret < 0) {
av_dict_free(&options);
return ret; return ret;
}
} }
av_dict_free((AVDictionary **)dst); av_dict_free((AVDictionary **)dst);
...@@ -2006,8 +2008,10 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o) ...@@ -2006,8 +2008,10 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o)
AVDictionaryEntry *en1 = NULL; AVDictionaryEntry *en1 = NULL;
AVDictionaryEntry *en2 = NULL; AVDictionaryEntry *en2 = NULL;
ret = av_dict_parse_string(&dict1, o->default_val.str, "=", ":", 0); ret = av_dict_parse_string(&dict1, o->default_val.str, "=", ":", 0);
if (ret < 0) if (ret < 0) {
av_dict_free(&dict1);
return ret; return ret;
}
do { do {
en1 = av_dict_get(dict1, "", en1, AV_DICT_IGNORE_SUFFIX); en1 = av_dict_get(dict1, "", en1, AV_DICT_IGNORE_SUFFIX);
en2 = av_dict_get(dict2, "", en2, AV_DICT_IGNORE_SUFFIX); en2 = av_dict_get(dict2, "", en2, AV_DICT_IGNORE_SUFFIX);
......
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