]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/aliaspixdec: Check input size against minimal picture size
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 30 Sep 2019 22:06:35 +0000 (00:06 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 20 Oct 2019 17:57:51 +0000 (19:57 +0200)
Fixes: Timeout (15sec -> 72ms)
Fixes: 17774/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALIAS_PIX_fuzzer-5193929107963904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/aliaspixdec.c

index 087b18fb91f5663d7d7ce870aeb01b95470a63d9..def7e17c0f8c031cf1cff67122cac38e3ee1e6a8 100644 (file)
@@ -62,6 +62,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     if (ret < 0)
         return ret;
 
+    if (bytestream2_get_bytes_left(&gb) < width*height / 255)
+        return AVERROR_INVALIDDATA;
+
     ret = ff_get_buffer(avctx, f, 0);
     if (ret < 0)
         return ret;