[FFmpeg-cvslog] avfilter/drawtext: fix frame mem leak

Ivan Efimov git at videolan.org
Tue Apr 14 12:14:23 CEST 2015


ffmpeg | branch: master | Ivan Efimov <ioefimov at gmail.com> | Fri Apr 10 17:28:45 2015 +0300| [2051b401cc7e9ec9051c7f575d639944a9869b67] | committer: Michael Niedermayer

avfilter/drawtext: fix frame mem leak

Signed-off-by: Ivan Efimov <ioefimov at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 37eb231..cf17a55 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -1275,12 +1275,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
     int ret;
 
     if (s->reload) {
-        if ((ret = load_textfile(ctx)) < 0)
+        if ((ret = load_textfile(ctx)) < 0) {
+            av_frame_free(&frame);
             return ret;
+        }
 #if CONFIG_LIBFRIBIDI
         if (s->text_shaping)
-            if ((ret = shape_text(ctx)) < 0)
+            if ((ret = shape_text(ctx)) < 0) {
+                av_frame_free(&frame);
                 return ret;
+            }
 #endif
     }
 



More information about the ffmpeg-cvslog mailing list