RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/vp3: Check for end of input in 2 places of vp4_unpack_macroblocks() 

Fixes: Timeout (82sec -> 1sec)
Fixes: 16411/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP3_fuzzer-5166958151991296

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit daf92cc074)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-09-01 17:37:47 +02:00
parent 372c91b199
commit 69db79074f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vp3.c
View File

@ -710,6 +710,8 @@ static int vp4_unpack_macroblocks(Vp3DecodeContext *s, GetBitContext *gb)
has_partial = 0; has_partial = 0;
bit = get_bits1(gb); bit = get_bits1(gb);
for (i = 0; i < s->yuv_macroblock_count; i += current_run) { for (i = 0; i < s->yuv_macroblock_count; i += current_run) {
if (get_bits_left(gb) <= 0)
return AVERROR_INVALIDDATA;
current_run = vp4_get_mb_count(s, gb); current_run = vp4_get_mb_count(s, gb);
if (current_run > s->yuv_macroblock_count - i) if (current_run > s->yuv_macroblock_count - i)
return -1; return -1;
@ -719,6 +721,8 @@ static int vp4_unpack_macroblocks(Vp3DecodeContext *s, GetBitContext *gb)
} }
if (has_partial) { if (has_partial) {
if (get_bits_left(gb) <= 0)
return AVERROR_INVALIDDATA;
bit = get_bits1(gb); bit = get_bits1(gb);
current_run = vp4_get_mb_count(s, gb); current_run = vp4_get_mb_count(s, gb);
for (i = 0; i < s->yuv_macroblock_count; i++) { for (i = 0; i < s->yuv_macroblock_count; i++) {