aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-25 00:13:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-25 02:52:42 +0200
commitbd33b15fe6a6e6f366e8bf59d3c73024c56b9e3d (patch)
tree6470824213c568f68b107e222c59b74f62342cf7
parent7ee48d9de118a26e51ef1e2b8b570022ace46145 (diff)
downloadffmpeg-bd33b15fe6a6e6f366e8bf59d3c73024c56b9e3d.tar.gz
avcodec/wavpack: Fix integer overflow in wv_unpack_stereo()
Fixes: runtime error: signed integer overflow: 2080374785 + 2080374784 cannot be represented in type 'int' Fixes: 2351/clusterfuzz-testcase-minimized-5359403240783872 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 73ea2a028e12a7d779834f78dc496c8c4b08361f) 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 1bb778f6a5..907e2f725b 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -474,7 +474,7 @@ static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb,
}
if (type == AV_SAMPLE_FMT_S16P) {
- if (FFABS(L) + FFABS(R) > (1<<19)) {
+ if (FFABS(L) + (unsigned)FFABS(R) > (1<<19)) {
av_log(s->avctx, AV_LOG_ERROR, "sample %d %d too large\n", L, R);
return AVERROR_INVALIDDATA;
}