diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2020-06-25 19:22:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:49:26 +0200 |
commit | c4ac9554f02a54d2f892357e212e0dab8fbbc7f5 (patch) | |
tree | 7e82266c5f01b3563658d538adc16b1b8cdb7cbe | |
parent | b3a653c92ee53a429a263b0c1e807a8f0bd56d2d (diff) | |
download | ffmpeg-c4ac9554f02a54d2f892357e212e0dab8fbbc7f5.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 519f78e547..110f62c48f 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -927,6 +927,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; |