diff mbox

[FFmpeg-devel,2/2] avcodec/vp8: Check for the bitstream end per MB in decode_mb_row_no_filter()

Message ID 20170307180939.20588-2-michael@niedermayer.cc
State Accepted
Commit 1afd246960202917e244c844c534e9c1e3c323f5
Headers show

Commit Message

Michael Niedermayer March 7, 2017, 6:09 p.m. UTC 
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
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/vp8.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox

Patch

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index a3d057d62e..6759b310f0 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -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) {