]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/iff: Test video_size being non zero
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 11 May 2020 19:18:58 +0000 (21:18 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 12 May 2020 19:39:13 +0000 (21:39 +0200)
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@niedermayer.cc>
libavcodec/iff.c

index b39bb2c312a7dc54ec7c0aff02836c8727992447..66879cbf5dde06f132e06ff803028324e9d84a79 100644 (file)
@@ -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));