avcodec/vp8: Check for the bitstream end per MB in decode_mb_row_no_filter()
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 7 Mar 2017 18:09:39 +0000 (19:09 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 7 Mar 2017 20:29:43 +0000 (21:29 +0100)
Fixes: timeout in 730/clusterfuzz-testcase-5265113739165696 (part 2 of 2)

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

index a3d057d..6759b31 100644 (file)
@@ -2330,6 +2330,8 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void
     s->mv_max.x = ((s->mb_width - 1) << 6) + MARGIN;
 
     for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) {
+        if (c->end <= c->buffer && c->bits >= 0)
+            return AVERROR_INVALIDDATA;
         // Wait for previous thread to read mb_x+2, and reach mb_y-1.
         if (prev_td != td) {
             if (threadnr != 0) {