From adb4854aac1767307aa422ae9f5d8fa1ff27c718 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 1 Jun 2017 20:42:30 +0200 Subject: avcodec/asvdec: Use rounded up dimenensions in input size check 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 --- libavcodec/asvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index 467e255..9a11446 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -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) -- cgit v1.1