]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/speedhq: Width < 8 is not supported
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 17 Mar 2021 12:14:39 +0000 (13:14 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 19 Mar 2021 22:59:45 +0000 (23:59 +0100)
Fixes: out of array access
Fixes: 31733/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEDHQ_fuzzer-4704307963363328
Fixes: 31736/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEDHQ_fuzzer-6190960292790272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/speedhq.c

index 5861b7f6b515e84887e301bf262c8487ca5fe3db..711bcd66d7d299053c017036956b29e997f6158e 100644 (file)
@@ -498,7 +498,7 @@ static int speedhq_decode_frame(AVCodecContext *avctx,
     uint32_t second_field_offset;
     int ret;
 
-    if (buf_size < 4)
+    if (buf_size < 4 || avctx->width < 8)
         return AVERROR_INVALIDDATA;
 
     quality = buf[0];