[FFmpeg-devel] [PATCH 2/3] avcodec/iff: Test video_size being non zero
Michael Niedermayer
michael at niedermayer.cc
Mon May 11 23:30:45 EEST 2020
Fixes: Out of array access
Fixes: 20659/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5658548592967680
Fixes: 20659/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5723561177382912
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/iff.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index b39bb2c312..66879cbf5d 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -440,6 +440,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (avctx->codec_tag == MKTAG('A', 'N', 'I', 'M')) {
s->video_size = FFALIGN(avctx->width, 2) * avctx->height * s->bpp;
+ if (!s->video_size)
+ return AVERROR_INVALIDDATA;
s->video[0] = av_calloc(FFALIGN(avctx->width, 2) * avctx->height, s->bpp);
s->video[1] = av_calloc(FFALIGN(avctx->width, 2) * avctx->height, s->bpp);
s->pal = av_calloc(256, sizeof(*s->pal));
--
2.17.1
More information about the ffmpeg-devel
mailing list