[FFmpeg-cvslog] avfilter/vf_premultiply: fix memory-leak on failure

Timo Rothenpieler git at videolan.org
Mon Nov 13 21:49:22 EET 2017


ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Wed Nov  8 19:17:51 2017 +0100| [c7ded42d5dfc0124008b5b9b13a1a342324885ed] | committer: Timo Rothenpieler

avfilter/vf_premultiply: fix memory-leak on failure

Fixes CID #1416352

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

 libavfilter/vf_premultiply.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c
index 5120adc476..df4f26578d 100644
--- a/libavfilter/vf_premultiply.c
+++ b/libavfilter/vf_premultiply.c
@@ -607,9 +607,10 @@ static int activate(AVFilterContext *ctx)
         int64_t pts;
 
         if ((ret = ff_inlink_consume_frame(ctx->inputs[0], &frame)) > 0) {
-            if ((ret = filter_frame(ctx, &out, frame, frame)) < 0)
-                return ret;
+            ret = filter_frame(ctx, &out, frame, frame);
             av_frame_free(&frame);
+            if (ret < 0)
+                return ret;
             ret = ff_filter_frame(ctx->outputs[0], out);
         }
         if (ret < 0) {



More information about the ffmpeg-cvslog mailing list