]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/adpcm: Fix overflow in FFABS() IMA_EA_EACS
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 6 Dec 2019 23:14:16 +0000 (00:14 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 11 Jan 2020 22:31:18 +0000 (23:31 +0100)
Fixes: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
Fixes: 19235/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_EA_EACS_fuzzer-5680878952382464
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/adpcm.c

index b99a21002cbd497ad0bfba181fb3dac7aec4cf91..7b5b3d96987c855c0f45d53e32a4cf2cedbc74e0 100644 (file)
@@ -1233,7 +1233,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
         }
         for (i=0; i<=st; i++) {
             c->status[i].predictor  = bytestream2_get_le32u(&gb);
-            if (FFABS(c->status[i].predictor) > (1<<16))
+            if (FFABS((int64_t)c->status[i].predictor) > (1<<16))
                 return AVERROR_INVALIDDATA;
         }