[FFmpeg-cvslog] avcodec/aliaspixdec: Check input size against minimal picture size

Michael Niedermayer git at videolan.org
Sun Oct 20 20:59:52 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Oct  1 00:06:35 2019 +0200| [8c693104779830028bd5f76bf32a93e059c04d2c] | committer: Michael Niedermayer

avcodec/aliaspixdec: Check input size against minimal picture size

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 at niedermayer.cc>

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

 libavcodec/aliaspixdec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/aliaspixdec.c b/libavcodec/aliaspixdec.c
index 087b18fb91..def7e17c0f 100644
--- a/libavcodec/aliaspixdec.c
+++ b/libavcodec/aliaspixdec.c
@@ -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;



More information about the ffmpeg-cvslog mailing list