ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu 
Jun  1 20:42:30 2017 +0200| [adb4854aac1767307aa422ae9f5d8fa1ff27c718] | 
committer: Michael Niedermayer

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 <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adb4854aac1767307aa422ae9f5d8fa1ff27c718
---

 libavcodec/asvdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c
index 467e2554ca..9a11446f52 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)

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to