[FFmpeg-devel] [PATCH 2/2] avcodec/snowdec: Check for remaining bitstream in decode_blocks()

Michael Niedermayer michael at niedermayer.cc
Wed Nov 15 22:17:16 EET 2017


Fixes: Timeout
Fixes: 3142/clusterfuzz-testcase-5007853163118592

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/snowdec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
index 77ffe7f594..99b5a86394 100644
--- a/libavcodec/snowdec.c
+++ b/libavcodec/snowdec.c
@@ -439,6 +439,8 @@ static int decode_blocks(SnowContext *s){
 
     for(y=0; y<h; y++){
         for(x=0; x<w; x++){
+            if (s->c.bytestream >= s->c.bytestream_end)
+                return AVERROR_INVALIDDATA;
             if ((res = decode_q_branch(s, 0, x, y)) < 0)
                 return res;
         }
-- 
2.15.0



More information about the ffmpeg-devel mailing list