diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-04 22:21:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-10-30 03:13:25 +0100 |
| commit | 78862488f85207633f29f5a66e42364024a14c3f (patch) | |
| tree | 18b0282066877527d9fe75551a37b7269b009023 /libavcodec/vp9.c | |
| parent | 0fb83b4c91d5a0784ca81df4283f25740c263f20 (diff) | |
| download | ffmpeg-78862488f85207633f29f5a66e42364024a14c3f.tar.gz | |
avcodec/vp9: Check in decode_tiles() if there is data remaining
Fixes: Timeout
Fixes: 9330/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP9_fuzzer-5707345857347584
Fixes: 9775/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP9_fuzzer-5643845344690176
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/vp9.c')
| -rw-r--r-- | libavcodec/vp9.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index b1178c9c0c..acf3ffc9e7 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1306,6 +1306,9 @@ static int decode_tiles(AVCodecContext *avctx, decode_sb_mem(td, row, col, lflvl_ptr, yoff2, uvoff2, BL_64X64); } else { + if (vpX_rac_is_end(td->c)) { + return AVERROR_INVALIDDATA; + } decode_sb(td, row, col, lflvl_ptr, yoff2, uvoff2, BL_64X64); } |