virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

libavfilter/scale2ref: Fix out-of-bounds array access

Browse Source 
ff_scale_eval_dimensions blindly assumes that two inputs are always
available as of 3385989b98. This is
notably not the case when the function is called for the scale
filter. With the scale filter inputs[1] does not exist.

ff_scale_eval_dimensions now has an updated scale2ref check that
makes certain two inputs are actually available before attempting to
access the second one.

Thanks to James Almer for reporting this bug. This should fix the 820
Valgrind tests I single-handedly managed to break.

Signed-off-by: Kevin Mark <kmark937@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Kevin Mark 2017-06-03 05:04:19 -04:00 committed by Michael Niedermayer
parent be3809a521
commit 08213e0b79
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/scale.c
View File

@ -115,7 +115,7 @@ int ff_scale_eval_dimensions(void *log_ctx,
int factor_w, factor_h; int factor_w, factor_h;
int eval_w, eval_h; int eval_w, eval_h;
int ret; int ret;
const char scale2ref = outlink->src->inputs[1] == inlink; const char scale2ref = outlink->src->nb_inputs == 2 && outlink->src->inputs[1] == inlink;
double var_values[VARS_NB + VARS_S2R_NB], res; double var_values[VARS_NB + VARS_S2R_NB], res;
const AVPixFmtDescriptor *main_desc; const AVPixFmtDescriptor *main_desc;
const AVFilterLink *main_link; const AVFilterLink *main_link;