har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/eval: factor av_expr_free() calls out

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-01 15:45:18 +02:00
parent b63c9a9990
commit 61123634dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/eval.c
View File

@ -683,19 +683,19 @@ int av_expr_parse(AVExpr **expr, const char *s,
if ((ret = parse_expr(&e, &p)) < 0) if ((ret = parse_expr(&e, &p)) < 0)
goto end; goto end;
if (*p.s) { 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); av_log(&p, AV_LOG_ERROR, "Invalid chars '%s' at the end of expression '%s'\n", p.s, s0);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end; goto end;
} }
if (!verify_expr(e)) { if (!verify_expr(e)) {
av_expr_free(e);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end; goto end;
} }
e->var= av_mallocz(sizeof(double) *VARS); e->var= av_mallocz(sizeof(double) *VARS);
*expr = e; *expr = e;
e = NULL;
end: end:
av_expr_free(e);
av_free(w); av_free(w);
return ret; return ret;
} }