]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/vmdaudio: Check chunk counts to avoid integer overflow
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 8 Nov 2019 16:28:27 +0000 (17:28 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 1 Dec 2019 16:17:04 +0000 (17:17 +0100)
Fixes: signed integer overflow: 4 * 538976288 cannot be represented in type 'int'
Fixes: 18622/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VMDAUDIO_fuzzer-5092166174507008
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/vmdaudio.c

index e8c8a064c7dcd3edc70a2e4fa8bf826b16a7f702..c7826fa3ce456dc4d38a026110d2b845a2ba35db 100644 (file)
@@ -179,6 +179,9 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data,
     /* drop incomplete chunks */
     buf_size     = audio_chunks * s->chunk_size;
 
+    if (silent_chunks + audio_chunks >= INT_MAX / avctx->block_align)
+        return AVERROR_INVALIDDATA;
+
     /* get output buffer */
     frame->nb_samples = ((silent_chunks + audio_chunks) * avctx->block_align) /
                         avctx->channels;