]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/wmalosslessdec: Fix integer overflow in mclms_predict()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 23 May 2020 20:02:56 +0000 (22:02 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 4 Jun 2020 21:58:49 +0000 (23:58 +0200)
Fixes: signed integer overflow: 2147483636 + 2048 cannot be represented in type 'int'
Fixes: 22016/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5109395618004992
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/wmalosslessdec.c

index 7ef7c93dbdc4333fd55776569090997732633de6..cfdd9e9a85140508deab79b30b5111f8bcaef5e9 100644 (file)
@@ -676,7 +676,7 @@ static void mclms_predict(WmallDecodeCtx *s, int icoef, int *pred)
         for (i = 0; i < ich; i++)
             pred[ich] += (uint32_t)s->channel_residues[i][icoef] *
                          s->mclms_coeffs_cur[i + num_channels * ich];
-        pred[ich] += (1 << s->mclms_scaling) >> 1;
+        pred[ich] += (1U << s->mclms_scaling) >> 1;
         pred[ich] >>= s->mclms_scaling;
         s->channel_residues[ich][icoef] += (unsigned)pred[ich];
     }