avcodec/msmpeg4dec: Check for input end in msmpeg4v34_decode_mb()
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 26 Feb 2018 15:44:50 +0000 (16:44 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 27 Feb 2018 18:37:06 +0000 (19:37 +0100)
Fixes: Timeout
Fixes: 6276/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV1_fuzzer-5881196690014208

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/msmpeg4dec.c

index 4105d4b..457a37e 100644 (file)
@@ -208,6 +208,9 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t block[6][64])
     uint8_t *coded_val;
     uint32_t * const mb_type_ptr = &s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride];
 
+    if (get_bits_left(&s->gb) <= 0)
+        return AVERROR_INVALIDDATA;
+
     if (s->pict_type == AV_PICTURE_TYPE_P) {
         if (s->use_skip_mb_code) {
             if (get_bits1(&s->gb)) {