diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-01 00:06:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-06 20:30:57 +0100 |
| commit | cdb193839ac55563b5c287b54c9141079845d733 (patch) | |
| tree | 49e7c5101dc31501525fd1a8be0d7cd14005626d | |
| parent | 77847fd19e71f3f424a4be8bcc933ccbde4db3ab (diff) | |
| download | ffmpeg-cdb193839ac55563b5c287b54c9141079845d733.tar.gz | |
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@niedermayer.cc>
(cherry picked from commit 8c693104779830028bd5f76bf32a93e059c04d2c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/aliaspixdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |