summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-04-27 21:44:06 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-04-29 18:02:22 +0200
commitda038c07f02dfc10380001c11b3d047eca7cb8c9 (patch)
tree14890b0a74860460b9cac03b62e0696754565ef0 /libavcodec
parentad164237047de2ff3989b69c92a3fee1560b3393 (diff)
downloadffmpeg-da038c07f02dfc10380001c11b3d047eca7cb8c9.tar.gz
avcodec/wavpack: Fix integer overflow in wv_unpack_stereo()
Fixes: runtime error: signed integer overflow: 2147483531 + 16384 cannot be represented in type 'int' Fixes: 6615/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-5165715515506688 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/wavpack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 0e40b29879..22a2c83a30 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -452,7 +452,7 @@ static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb,
if (type != AV_SAMPLE_FMT_S16P)
R2 = R + ((s->decorr[i].weightB * (int64_t)L2 + 512) >> 10);
else
- R2 = R + ((int)(s->decorr[i].weightB * (unsigned)L2 + 512) >> 10);
+ R2 = R + (unsigned)((int)(s->decorr[i].weightB * (unsigned)L2 + 512) >> 10);
UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, L2, R);
R = R2;
s->decorr[i].samplesA[0] = R;