diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-02 01:26:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-10 01:52:56 +0200 |
| commit | 4652b0f8fe8a444619f695bc1921d0d8133e1203 (patch) | |
| tree | 5dcb9f36c19ec74cd6aad70dfee44bca940cb6b3 | |
| parent | 29c7a02bb2858e669441c642af3230db5f147f50 (diff) | |
| download | ffmpeg-4652b0f8fe8a444619f695bc1921d0d8133e1203.tar.gz | |
avcodec/indeo4: Check for end of bitstream in decode_mb_info()
Fixes: Timeout
Fixes: 8776/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-5361788798369792
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 267ba2aa96354c5b6a1ea89b2943fbd7a4893862)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/indeo4.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 13fc42ecde..b2d3cd5f4b 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -505,6 +505,11 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band, mb->b_mv_x = mb->b_mv_y = 0; + if (get_bits_left(&ctx->gb) < 1) { + av_log(avctx, AV_LOG_ERROR, "Insufficient input for mb info\n"); + return AVERROR_INVALIDDATA; + } + if (get_bits1(&ctx->gb)) { if (ctx->frame_type == IVI4_FRAMETYPE_INTRA) { av_log(avctx, AV_LOG_ERROR, "Empty macroblock in an INTRA picture!\n"); |