]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/apedec: make left/right unsigned to avoid undefined behavior
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 2 Jul 2019 10:13:19 +0000 (12:13 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 31 Jul 2019 18:35:07 +0000 (20:35 +0200)
Fixes: signed integer overflow: 755176387 + 1515360583 cannot be represented in type 'int'
Fixes: 15506/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5706859232624640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/apedec.c

index 27425b17e6fdc2f309c8131be3c61f8d9a625648..7a7097e7a48620b03d6cc278adb67b70d92161c0 100644 (file)
@@ -1376,7 +1376,7 @@ static void ape_unpack_mono(APEContext *ctx, int count)
 
 static void ape_unpack_stereo(APEContext *ctx, int count)
 {
-    int32_t left, right;
+    unsigned left, right;
     int32_t *decoded0 = ctx->decoded[0];
     int32_t *decoded1 = ctx->decoded[1];
 
@@ -1393,7 +1393,7 @@ static void ape_unpack_stereo(APEContext *ctx, int count)
 
     /* Decorrelate and scale to output depth */
     while (count--) {
-        left = *decoded1 - (*decoded0 / 2);
+        left = *decoded1 - (unsigned)(*decoded0 / 2);
         right = left + *decoded0;
 
         *(decoded0++) = left;