diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-06-25 19:22:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-05 13:01:36 +0200 |
| commit | 8cae3778ea21388be0bcbe747826e8cd63832b7b (patch) | |
| tree | edf4d6ccc09b66c85bb9b6d3b81df86795993547 | |
| parent | 453519af0d4a50bbc62999b312de9692e429bf22 (diff) | |
| download | ffmpeg-8cae3778ea21388be0bcbe747826e8cd63832b7b.tar.gz | |
avcodec/pngdec: Check for fctl after idat
Fixes: out of array access
Fixes: 23554/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APNG_fuzzer-4796622520451072.fuzz
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 65b1ba680fb67902a9c876a49d0146eaae5a1c3d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/pngdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index bfc7c9da0b..4cace3d5af 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -925,6 +925,11 @@ static int decode_fctl_chunk(AVCodecContext *avctx, PNGDecContext *s, return AVERROR_INVALIDDATA; } + if (s->pic_state & PNG_IDAT) { + av_log(avctx, AV_LOG_ERROR, "fctl after IDAT\n"); + return AVERROR_INVALIDDATA; + } + s->last_w = s->cur_w; s->last_h = s->cur_h; s->last_x_offset = s->x_offset; |