avcodec/vp3: Check eob_run

Fixes: out of array access
Fixes: 5919/clusterfuzz-testcase-minimized-5859311382167552
Fixes: special case for theora (untested due to lack of sample)

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-02-09 04:17:16 +01:00
parent 76cc0f0f67
commit 570023eab3

View File

@ -978,6 +978,9 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
if (eob_run_get_bits[token]) if (eob_run_get_bits[token])
eob_run += get_bits(gb, eob_run_get_bits[token]); eob_run += get_bits(gb, eob_run_get_bits[token]);
if (!eob_run)
eob_run = INT_MAX;
// record only the number of blocks ended in this plane, // record only the number of blocks ended in this plane,
// any spill will be recorded in the next plane. // any spill will be recorded in the next plane.
if (eob_run > num_coeffs - coeff_i) { if (eob_run > num_coeffs - coeff_i) {