avcodec/asvdec: Use rounded up dimenensions in input size check
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 1 Jun 2017 18:42:30 +0000 (20:42 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 1 Jun 2017 20:20:16 +0000 (22:20 +0200)
Fixes: Timeout
Fixes: 2001/clusterfuzz-testcase-minimized-6187599389523968

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

index 467e255..9a11446 100644 (file)
@@ -210,7 +210,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     AVFrame *const p = data;
     int mb_x, mb_y, ret;
 
-    if (buf_size * 8LL < a->mb_height2 * a->mb_width2 * 13LL)
+    if (buf_size * 8LL < a->mb_height * a->mb_width * 13LL)
         return AVERROR_INVALIDDATA;
 
     if ((ret = ff_get_buffer(avctx, p, 0)) < 0)