aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-19 14:08:58 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-22 03:07:20 +0200
commit48b0e94a6cb5f1278354743b89bcc8984fb1b560 (patch)
tree5efc2786bd0e1fc52cf0d1d13ec5546a0aa1422d
parent1124df46393b4e8fa37712b942b3e7fe6e3a97d5 (diff)
downloadffmpeg-48b0e94a6cb5f1278354743b89bcc8984fb1b560.tar.gz
avcodec/wavpack: Fix undefined integer negation
Fixes: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself Fixes: 2291/clusterfuzz-testcase-minimized-5538453481586688 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 5f89747086af741ddc34e2378cde8519b8faee78) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/wavpack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index e55cd82595..0dcc05037d 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -307,8 +307,8 @@ static float wv_get_value_float(WavpackFrameContext *s, uint32_t *crc, int S)
S <<= s->float_shift;
sign = S < 0;
if (sign)
- S = -S;
- if (S >= 0x1000000) {
+ S = -(unsigned)S;
+ if (S >= 0x1000000U) {
if (s->got_extra_bits && get_bits1(&s->gb_extra_bits))
S = get_bits(&s->gb_extra_bits, 23);
else