diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-05-14 20:23:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-25 13:30:09 +0200 |
| commit | c830752142bb5e052d540c429d41fb6dafe920db (patch) | |
| tree | 99856fa4a0b3ea38a9629a852740392fe4afc5ac /libavcodec | |
| parent | 2b634e7c23f9e51a5e457985cd116cba5962f552 (diff) | |
| download | ffmpeg-c830752142bb5e052d540c429d41fb6dafe920db.tar.gz | |
avcodec/pngdec: Check input space
Fixes: Timeout (33sec -> 78ms)
Fixes: 14668/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LSCR_fuzzer-5767073352908800
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pngdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 7fcf83e347..5209e342db 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1535,6 +1535,9 @@ static int decode_frame_lscr(AVCodecContext *avctx, AVFrame *frame = data; int ret, nb_blocks, offset = 0; + if (avpkt->size < 2) + return AVERROR_INVALIDDATA; + bytestream2_init(gb, avpkt->data, avpkt->size); if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) |