]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/wmalosslessdec: Fix 2 overflows in mclms
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 20 Nov 2019 21:05:40 +0000 (22:05 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 15 Dec 2019 00:01:22 +0000 (01:01 +0100)
Fixes: signed integer overflow: 2038337026 + 109343477 cannot be represented in type 'int'
Fixes: 18886/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5673660505653248
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 7afadaae4a2b1075bb2e45a419ddc2bf1c7d6d3e..d4dd0ed4e35c2c442f9207d18d19abffde5a175a 100644 (file)
@@ -628,7 +628,7 @@ static void mclms_update(WmallDecodeCtx *s, int icoef, int *pred)
     int range        = 1 << (s->bits_per_sample - 1);
 
     for (ich = 0; ich < num_channels; ich++) {
-        pred_error = s->channel_residues[ich][icoef] - pred[ich];
+        pred_error = s->channel_residues[ich][icoef] - (unsigned)pred[ich];
         if (pred_error > 0) {
             for (i = 0; i < order * num_channels; i++)
                 s->mclms_coeffs[i + ich * order * num_channels] +=
@@ -680,7 +680,7 @@ static void mclms_predict(WmallDecodeCtx *s, int icoef, int *pred)
                          s->mclms_coeffs_cur[i + num_channels * ich];
         pred[ich] += (1 << s->mclms_scaling) >> 1;
         pred[ich] >>= s->mclms_scaling;
-        s->channel_residues[ich][icoef] += pred[ich];
+        s->channel_residues[ich][icoef] += (unsigned)pred[ich];
     }
 }