[FFmpeg-cvslog] avcodec/pngdec: dont skip/read chunk twice
Michael Niedermayer
git at videolan.org
Sun Feb 26 15:17:14 EET 2023
ffmpeg | branch: release/6.0 | Michael Niedermayer <michael at niedermayer.cc> | Wed Jan 11 23:56:05 2023 +0100| [3ae6feff7ebf7bfbd74c0617ddc8c13adaadfd7b] | committer: Michael Niedermayer
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 at niedermayer.cc>
(cherry picked from commit df1a38d5200e14a29903f1027b4548d595c7ff8a)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ae6feff7ebf7bfbd74c0617ddc8c13adaadfd7b
---
libavcodec/pngdec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 1ba1bb20d0..d63640345b 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -1238,6 +1238,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);
More information about the ffmpeg-cvslog
mailing list