avcodec/sbcdec: Fix integer overflows in sbc_synthesize_four()
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 21 Oct 2019 22:09:11 +0000 (00:09 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 9 Nov 2019 16:59:32 +0000 (17:59 +0100)
Fixes: signed integer overflow: 1494495519 + 1494495519 cannot be represented in type 'int'
Fixes: 18347/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SBC_fuzzer-5711714661695488

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/sbcdec.c

index 23226d5..d8ea685 100644 (file)
@@ -227,10 +227,10 @@ static inline void sbc_synthesize_four(struct sbc_decoder_state *state,
 
         /* Distribute the new matrix value to the shifted position */
         v[offset[i]] =
-            ( ff_synmatrix4[i][0] * frame->sb_sample[blk][ch][0] +
-              ff_synmatrix4[i][1] * frame->sb_sample[blk][ch][1] +
-              ff_synmatrix4[i][2] * frame->sb_sample[blk][ch][2] +
-              ff_synmatrix4[i][3] * frame->sb_sample[blk][ch][3] ) >> 15;
+            (int)( (unsigned)ff_synmatrix4[i][0] * frame->sb_sample[blk][ch][0] +
+                   (unsigned)ff_synmatrix4[i][1] * frame->sb_sample[blk][ch][1] +
+                   (unsigned)ff_synmatrix4[i][2] * frame->sb_sample[blk][ch][2] +
+                   (unsigned)ff_synmatrix4[i][3] * frame->sb_sample[blk][ch][3] ) >> 15;
     }
 
     /* Compute the samples */
@@ -239,16 +239,16 @@ static inline void sbc_synthesize_four(struct sbc_decoder_state *state,
 
         /* Store in output, Q0 */
         AV_WN16A(&output_frame->data[ch][blk * 8 + i * 2], av_clip_int16(
-            ( v[offset[i] + 0] * ff_sbc_proto_4_40m0[idx + 0] +
-              v[offset[k] + 1] * ff_sbc_proto_4_40m1[idx + 0] +
-              v[offset[i] + 2] * ff_sbc_proto_4_40m0[idx + 1] +
-              v[offset[k] + 3] * ff_sbc_proto_4_40m1[idx + 1] +
-              v[offset[i] + 4] * ff_sbc_proto_4_40m0[idx + 2] +
-              v[offset[k] + 5] * ff_sbc_proto_4_40m1[idx + 2] +
-              v[offset[i] + 6] * ff_sbc_proto_4_40m0[idx + 3] +
-              v[offset[k] + 7] * ff_sbc_proto_4_40m1[idx + 3] +
-              v[offset[i] + 8] * ff_sbc_proto_4_40m0[idx + 4] +
-              v[offset[k] + 9] * ff_sbc_proto_4_40m1[idx + 4] ) >> 15));
+         (int)( (unsigned)v[offset[i] + 0] * ff_sbc_proto_4_40m0[idx + 0] +
+                (unsigned)v[offset[k] + 1] * ff_sbc_proto_4_40m1[idx + 0] +
+                (unsigned)v[offset[i] + 2] * ff_sbc_proto_4_40m0[idx + 1] +
+                (unsigned)v[offset[k] + 3] * ff_sbc_proto_4_40m1[idx + 1] +
+                (unsigned)v[offset[i] + 4] * ff_sbc_proto_4_40m0[idx + 2] +
+                (unsigned)v[offset[k] + 5] * ff_sbc_proto_4_40m1[idx + 2] +
+                (unsigned)v[offset[i] + 6] * ff_sbc_proto_4_40m0[idx + 3] +
+                (unsigned)v[offset[k] + 7] * ff_sbc_proto_4_40m1[idx + 3] +
+                (unsigned)v[offset[i] + 8] * ff_sbc_proto_4_40m0[idx + 4] +
+                (unsigned)v[offset[k] + 9] * ff_sbc_proto_4_40m1[idx + 4] ) >> 15));
     }
 }