]> git.sesse.net Git - ffmpeg/commitdiff
avformat/wvdec: Check rate for overflow
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 20 Sep 2020 18:53:31 +0000 (20:53 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 21 Sep 2020 09:53:25 +0000 (11:53 +0200)
Fixes: signed integer overflow: 6000 * -2147483648 cannot be represented in type 'int'
Fixes: 25700/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6578316302352384
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/wvdec.c

index b9fc6a59f92f6cd3de830831d792817204939321..7a5997c1ee710f8404147357e367b0f4042d39e7 100644 (file)
@@ -79,8 +79,9 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb)
 {
     WVContext *wc = ctx->priv_data;
     int ret;
-    int rate, rate_x, bpp, chan;
+    int rate, bpp, chan;
     uint32_t chmask, flags;
+    unsigned rate_x;
 
     wc->pos = avio_tell(pb);
 
@@ -192,7 +193,7 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb)
             if (id & 0x40)
                 avio_skip(pb, 1);
         }
-        if (rate == -1) {
+        if (rate == -1 || rate * (uint64_t)rate_x >= INT_MAX) {
             av_log(ctx, AV_LOG_ERROR,
                    "Cannot determine custom sampling rate\n");
             return AVERROR_INVALIDDATA;