diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-05 20:08:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-13 23:52:16 +0200 |
| commit | 62f07825ba11502b329716baddadea112c1837e5 (patch) | |
| tree | 6ae724511718739a9e77d6b95bb596f850a6858d /libavcodec | |
| parent | 32234e03a792e3ceca58359d6f2b7244ceb6b77f (diff) | |
| download | ffmpeg-62f07825ba11502b329716baddadea112c1837e5.tar.gz | |
avcodec/vp3: Check that there will be sufficient input for the coded fragments in unpack_superblocks()
Fixes: Timeout
Fixes: 6292/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP3_fuzzer-4871218218926080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vp3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 1d83753314..2050090670 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -543,7 +543,10 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) : s->y_superblock_count); int num_coded_frags = 0; - for (i = sb_start; i < sb_end && get_bits_left(gb) > 0; i++) { + for (i = sb_start; i < sb_end; i++) { + if (get_bits_left(gb) < ((s->total_num_coded_frags + num_coded_frags) >> 2)) { + return AVERROR_INVALIDDATA; + } /* iterate through all 16 fragments in a superblock */ for (j = 0; j < 16; j++) { /* if the fragment is in bounds, check its coding status */ |