Commit 485107d0b7 for ffmpeg
commit 485107d0b73bd44ec2b6092e2fbfca76146ec172
Author: Michael Niedermayer <michael@niedermayer.cc>
Date: Thu Nov 12 01:25:28 2026 +0100
avfilter/vf_drawtext: keep the parsed expressions when the new ones fail to parse
Fixes: NULL pointer dereference
Fixes: h6dDBZrc7mdt
Found during the triage of a finding from the review of https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25800
NULL pointer dereference Replicated through UnModified FFmpeg with ASAN
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 2ccb03600e..f17ce66494 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -1150,6 +1150,7 @@ static int config_input(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
DrawTextContext *s = ctx->priv;
+ AVExpr *x_pexpr = NULL, *y_pexpr = NULL, *a_pexpr = NULL;
char *expr;
int ret;
@@ -1175,21 +1176,25 @@ 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->a_pexpr);
- s->x_pexpr = s->y_pexpr = s->a_pexpr = NULL;
-
- if ((ret = av_expr_parse(&s->x_pexpr, expr = s->x_expr, var_names,
+ if ((ret = av_expr_parse(&x_pexpr, expr = s->x_expr, var_names,
NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
- (ret = av_expr_parse(&s->y_pexpr, expr = s->y_expr, var_names,
+ (ret = av_expr_parse(&y_pexpr, expr = s->y_expr, var_names,
NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
- (ret = av_expr_parse(&s->a_pexpr, expr = s->a_expr, var_names,
+ (ret = av_expr_parse(&a_pexpr, expr = s->a_expr, var_names,
NULL, NULL, fun2_names, fun2, 0, ctx)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to parse expression: %s \n", expr);
+ av_expr_free(x_pexpr);
+ av_expr_free(y_pexpr);
return AVERROR(EINVAL);
}
+ av_expr_free(s->x_pexpr);
+ av_expr_free(s->y_pexpr);
+ av_expr_free(s->a_pexpr);
+ s->x_pexpr = x_pexpr;
+ s->y_pexpr = y_pexpr;
+ s->a_pexpr = a_pexpr;
+
return 0;
}