From 61123634dda06384980ea66289af1b378246b47d Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 1 Apr 2015 15:45:18 +0200
Subject: [PATCH] avutil/eval: factor av_expr_free() calls out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavutil/eval.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 5099e57faed..ea318560dea 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -683,19 +683,19 @@ int av_expr_parse(AVExpr **expr, const char *s,
if ((ret = parse_expr(&e, &p)) < 0)
goto end;
if (*p.s) {
- av_expr_free(e);
av_log(&p, AV_LOG_ERROR, "Invalid chars '%s' at the end of expression '%s'\n", p.s, s0);
ret = AVERROR(EINVAL);
goto end;
}
if (!verify_expr(e)) {
- av_expr_free(e);
ret = AVERROR(EINVAL);
goto end;
}
e->var= av_mallocz(sizeof(double) *VARS);
*expr = e;
+ e = NULL;
end:
+ av_expr_free(e);
av_free(w);
return ret;
}
--
GitLab