aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-30 03:09:11 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-16 01:05:28 +0200
commitb424fde5decd155837aee85c038f4619fed54884 (patch)
tree878e8e7331703d910a9509bf254226c8bf392bf0
parentdf7f051f4dbfd7b2b11c47582776c6ddf3ca39ca (diff)
downloadffmpeg-b424fde5decd155837aee85c038f4619fed54884.tar.gz
avcodec/wavpack: Fix runtime error: signed integer overflow: 24 * -2147483648 cannot be represented in type 'int'
Fixes: 1894/clusterfuzz-testcase-minimized-4716739789062144 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d90c5bf10559554d6f9cd1dfb90767b991b76d5d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/wavpack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index ccdc675294..d5a750a249 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -548,7 +548,7 @@ static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb,
if (type != AV_SAMPLE_FMT_S16P)
S = T + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10);
else
- S = T + ((s->decorr[i].weightA * A + 512) >> 10);
+ S = T + ((int)(s->decorr[i].weightA * (unsigned)A + 512) >> 10);
if (A && T)
s->decorr[i].weightA -= ((((T ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
s->decorr[i].samplesA[j] = T = S;