Browse code

vf_drawtext: don't leak the expressions.

Anton Khirnov authored on 2013/03/19 06:13:35
Showing 1 changed files
... ...
@@ -402,6 +402,10 @@ static av_cold void uninit(AVFilterContext *ctx)
402 402
     DrawTextContext *s = ctx->priv;
403 403
     int i;
404 404
 
405
+    av_expr_free(s->x_pexpr);
406
+    av_expr_free(s->y_pexpr);
407
+    av_expr_free(s->d_pexpr);
408
+    s->x_pexpr = s->y_pexpr = s->d_pexpr = NULL;
405 409
     av_freep(&s->expanded_text);
406 410
     av_freep(&s->positions);
407 411
     av_tree_enumerate(s->glyphs, NULL, NULL, glyph_enu_free);
... ...
@@ -573,6 +577,10 @@ static int config_input(AVFilterLink *inlink)
573 573
 
574 574
     av_lfg_init(&s->prng, av_get_random_seed());
575 575
 
576
+    av_expr_free(s->x_pexpr);
577
+    av_expr_free(s->y_pexpr);
578
+    av_expr_free(s->d_pexpr);
579
+    s->x_pexpr = s->y_pexpr = s->d_pexpr = NULL;
576 580
     if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names,
577 581
                              NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
578 582
         (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names,