aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-07-02 12:13:19 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-07-31 20:35:07 +0200
commitbf778af1493b0814696307432763246fb53c75e7 (patch)
treed86a4b4d9e48808ff80ac0de31fe122727dc572b
parent267eb2ab7f87696e1a156ca9a5ff1b1628d170c1 (diff)
downloadffmpeg-bf778af1493b0814696307432763246fb53c75e7.tar.gz
avcodec/apedec: make left/right unsigned to avoid undefined behavior
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>
-rw-r--r--libavcodec/apedec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 27425b17e6..7a7097e7a4 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -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;