summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2023-01-11 23:56:05 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2023-03-27 13:37:19 +0200
commit904836c89fbb176f019816ccb32a3517acf6e8f6 (patch)
tree94f5ea91d937ea7e8e5d5e9d62bf0bda7e2cfde3
parentebdeef043a164f70d7299a21769be090ba34f760 (diff)
downloadffmpeg-904836c89fbb176f019816ccb32a3517acf6e8f6.tar.gz
avcodec/pngdec: dont skip/read chunk twice
Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PNG_fuzzer-6668158952144896.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 df1a38d5200e14a29903f1027b4548d595c7ff8a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/pngdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 0bd2dbfca2..111afd9a4a 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -1229,6 +1229,7 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s,
}
av_log(avctx, AV_LOG_ERROR, ", skipping\n");
bytestream2_skip(&s->gb, length + 8); /* tag */
+ continue;
}
}
tag = bytestream2_get_le32(&s->gb);