diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-20 22:19:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-25 21:50:17 +0200 |
| commit | 1cbac9ce20d32806febf64cbd9f830e1485695ca (patch) | |
| tree | e511bfd82cc5f8e1735b27e2d5e36a4d9d374ebc /libavcodec/vb.c | |
| parent | acba153a148782c08f9fd17f0c05b93468f3cbd0 (diff) | |
| download | ffmpeg-1cbac9ce20d32806febf64cbd9f830e1485695ca.tar.gz | |
avcodec/vb: Check for end of bytestream before reading blocktype
Fixes: Timeout
Fixes: 9601/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VB_fuzzer-4550228702134272
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/vb.c')
| -rw-r--r-- | libavcodec/vb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/vb.c b/libavcodec/vb.c index 021657f7d8..c6dd6fb456 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -107,6 +107,10 @@ static int vb_decode_framedata(VBDecContext *c, int offset) blk2 = 0; for (blk = 0; blk < blocks; blk++) { if (!(blk & 3)) { + if (bytestream2_get_bytes_left(&g) < 1) { + av_log(c->avctx, AV_LOG_ERROR, "Insufficient data\n"); + return AVERROR_INVALIDDATA; + } blocktypes = bytestream2_get_byte(&g); } switch (blocktypes & 0xC0) { |