]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/binkaudio: Check sample rate
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 10 Oct 2019 22:40:07 +0000 (00:40 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 17 Oct 2019 16:04:37 +0000 (18:04 +0200)
Fixes: signed integer overflow: 1092624416 * 2 cannot be represented in type 'int'
Fixes: 18045/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_RDFT_fuzzer-5718519492116480
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/binkaudio.c

index 96cf968c66e6e2bb4eccc2986eaab865d7279cd6..2384ebf312c08b9a9c9014d5467a5e29c44a3023 100644 (file)
@@ -95,6 +95,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
     if (avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT) {
         // audio is already interleaved for the RDFT format variant
         avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
+        if (sample_rate > INT_MAX / avctx->channels)
+            return AVERROR_INVALIDDATA;
         sample_rate  *= avctx->channels;
         s->channels = 1;
         if (!s->version_b)