Commit 0314dead authored by Måns Rullgård's avatar Måns Rullgård

eval: replace variable-length array with av_malloc/free

There is a theoretical possibility to pass a very long string to ff_parse,
which could crash if allocated from the stack.  This allows the allocation
to be checked properly.

Originally committed as revision 19670 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8313e179
...@@ -369,8 +369,12 @@ AVEvalExpr * ff_parse(const char *s, const char * const *const_name, ...@@ -369,8 +369,12 @@ AVEvalExpr * ff_parse(const char *s, const char * const *const_name,
double (**func2)(void *, double, double), const char **func2_name, double (**func2)(void *, double, double), const char **func2_name,
const char **error){ const char **error){
Parser p; Parser p;
AVEvalExpr * e; AVEvalExpr *e = NULL;
char w[strlen(s) + 1], * wp = w; char *w = av_malloc(strlen(s) + 1);
char *wp = w;
if (!w)
goto end;
while (*s) while (*s)
if (!isspace(*s++)) *wp++ = s[-1]; if (!isspace(*s++)) *wp++ = s[-1];
...@@ -388,8 +392,10 @@ AVEvalExpr * ff_parse(const char *s, const char * const *const_name, ...@@ -388,8 +392,10 @@ AVEvalExpr * ff_parse(const char *s, const char * const *const_name,
e = parse_expr(&p); e = parse_expr(&p);
if (!verify_expr(e)) { if (!verify_expr(e)) {
ff_eval_free(e); ff_eval_free(e);
return NULL; e = NULL;
} }
end:
av_free(w);
return e; return e;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment