[FFmpeg-devel] [PATCH V1 11/12] libavutil/opt: fix memory leak after av_dict_parse_string fail
Jun Zhao
mypopydev at gmail.com
Wed Jan 1 07:20:39 EET 2020
From: Jun Zhao <barryjzhao at tencent.com>
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.
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
---
libavutil/opt.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 60161d4..a482feb 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -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);
--
1.7.1
More information about the ffmpeg-devel
mailing list