[FFmpeg-cvslog] vf_drawtext: don't leak the expressions.

Anton Khirnov git at videolan.org
Fri May 17 11:40:19 CEST 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Mar 18 22:13:35 2013 +0100| [3fb29588a27a711132106b924e27b53789a58dcb] | committer: Anton Khirnov

vf_drawtext: don't leak the expressions.

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

 libavfilter/vf_drawtext.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 2989bd5..53340c8 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -402,6 +402,10 @@ static av_cold void uninit(AVFilterContext *ctx)
     DrawTextContext *s = ctx->priv;
     int i;
 
+    av_expr_free(s->x_pexpr);
+    av_expr_free(s->y_pexpr);
+    av_expr_free(s->d_pexpr);
+    s->x_pexpr = s->y_pexpr = s->d_pexpr = NULL;
     av_freep(&s->expanded_text);
     av_freep(&s->positions);
     av_tree_enumerate(s->glyphs, NULL, NULL, glyph_enu_free);
@@ -573,6 +577,10 @@ static int config_input(AVFilterLink *inlink)
 
     av_lfg_init(&s->prng, av_get_random_seed());
 
+    av_expr_free(s->x_pexpr);
+    av_expr_free(s->y_pexpr);
+    av_expr_free(s->d_pexpr);
+    s->x_pexpr = s->y_pexpr = s->d_pexpr = NULL;
     if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names,
                              NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
         (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names,



More information about the ffmpeg-cvslog mailing list