]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/twinvqdec: Correct overflow in block align check
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 3 Dec 2019 18:48:46 +0000 (19:48 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 31 Dec 2019 17:43:50 +0000 (18:43 +0100)
Fixes: signed integer overflow: 538976288 * 8 cannot be represented in type 'int'
Fixes: 19126/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TWINVQ_fuzzer-5687464110325760
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/twinvqdec.c

index c2353f51b56e02561ddacfec6f08ebace3e27849..c00ebb2ad5a75506d148b6e48c1651fa7bf99c36 100644 (file)
@@ -404,7 +404,7 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx)
     tctx->frame_size     = avctx->bit_rate * tctx->mtab->size
                                            / avctx->sample_rate + 8;
     tctx->is_6kbps       = 0;
-    if (avctx->block_align && avctx->block_align * 8 / tctx->frame_size > 1) {
+    if (avctx->block_align && avctx->block_align * 8LL / tctx->frame_size > 1) {
         av_log(avctx, AV_LOG_ERROR,
                "VQF TwinVQ should have only one frame per packet\n");
         return AVERROR_INVALIDDATA;