[FFmpeg-cvslog] avfilter/af_hdcd: Fix leak of memory allocated by ff_make_format_list()

Michael Niedermayer git at videolan.org
Sun Jan 22 03:31:00 EET 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Jan 21 23:44:51 2017 +0100| [0a5add45c7527bbe627899be744f962588e5b2fa] | committer: Michael Niedermayer

avfilter/af_hdcd: Fix leak of memory allocated by ff_make_format_list()

Fixes CID1396265

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavfilter/af_hdcd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index caee470..1248fd9 100644
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@@ -1635,13 +1635,11 @@ static int query_formats(AVFilterContext *ctx)
         return ret;
 
     in_formats = ff_make_format_list(sample_fmts_in);
-    out_formats = ff_make_format_list(sample_fmts_out);
-    if (!in_formats || !out_formats)
-        return AVERROR(ENOMEM);
-
     ret = ff_formats_ref(in_formats, &inlink->out_formats);
     if (ret < 0)
         return ret;
+
+    out_formats = ff_make_format_list(sample_fmts_out);
     ret = ff_formats_ref(out_formats, &outlink->in_formats);
     if (ret < 0)
         return ret;



More information about the ffmpeg-cvslog mailing list