avcodec/escape124: Check depth against num_superblocks
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 20 May 2017 21:01:02 +0000 (23:01 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 22 May 2017 17:42:39 +0000 (19:42 +0200)
Fixes: runtime error: left shift of 66184 by 15 places cannot be represented in type 'int'
Fixes: 1707/clusterfuzz-testcase-minimized-6502767008940032

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

index c3174ce..eb051eb 100644 (file)
@@ -267,6 +267,11 @@ static int escape124_decode_frame(AVCodecContext *avctx,
                     cb_size = s->num_superblocks << cb_depth;
                 }
             }
+            if (s->num_superblocks >= INT_MAX >> cb_depth) {
+                av_log(avctx, AV_LOG_ERROR, "Depth or num_superblocks are too large\n");
+                return AVERROR_INVALIDDATA;
+            }
+
             av_freep(&s->codebooks[i].blocks);
             s->codebooks[i] = unpack_codebook(&gb, cb_depth, cb_size);
             if (!s->codebooks[i].blocks)