[FFmpeg-cvslog] lavfi/coreimage: fix memory leak after av_dict_parse_string fail

Jun Zhao git at videolan.org
Sat Jan 4 03:07:17 EET 2020


ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Wed Jan  1 12:27:18 2020 +0800| [c8e72a6494ebffbe930a30823cb70a0671e6bfe0] | committer: Jun Zhao

lavfi/coreimage: 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.

Signed-off-by: Jun Zhao <barryjzhao at tencent.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8e72a6494ebffbe930a30823cb70a0671e6bfe0
---

 libavfilter/vf_coreimage.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m
index 323a28caa1..4ed5ba7920 100644
--- a/libavfilter/vf_coreimage.m
+++ b/libavfilter/vf_coreimage.m
@@ -486,6 +486,7 @@ static av_cold int init(AVFilterContext *fctx)
         av_log(ctx, AV_LOG_DEBUG, "Filter_string: %s\n", ctx->filter_string);
         ret = av_dict_parse_string(&filter_dict, ctx->filter_string, "@", "#", AV_DICT_MULTIKEY); // parse filter_name:all_filter_options
         if (ret) {
+            av_dict_free(&filter_dict);
             av_log(ctx, AV_LOG_ERROR, "Parsing of filters failed.\n");
             return AVERROR(EIO);
         }
@@ -507,6 +508,7 @@ static av_cold int init(AVFilterContext *fctx)
             if (strncmp(f->value, "default", 7)) { // not default
                 ret = av_dict_parse_string(&filter_options, f->value, "=", "@", 0); // parse option_name:option_value
                 if (ret) {
+                    av_dict_free(&filter_options);
                     av_log(ctx, AV_LOG_ERROR, "Parsing of filter options for \"%s\" failed.\n", f->key);
                     return AVERROR(EIO);
                 }



More information about the ffmpeg-cvslog mailing list