summaryrefslogtreecommitdiff
path: root/libavcodec/wavpack.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-02-28 22:07:38 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-03-02 03:16:15 +0100
commitf8060ab927f89db8844b1a0e0709159662e6167b (patch)
treeff5d1b611d4195dc931cd74f8e503f14eee8e1ab /libavcodec/wavpack.h
parent12c3e120fe8f8d6881001eade390d8a5c185783d (diff)
avcodec/wavpack: Check value before shift in wp_exp2()
Fixes undefined shift, all callers should be changed to check the value they use with wp_exp2() or its return value. Fixes: 692/clusterfuzz-testcase-5757381516460032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/wavpack.h')
-rw-r--r--libavcodec/wavpack.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/wavpack.h b/libavcodec/wavpack.h
index a1b46d5bd7..0196574aab 100644
--- a/libavcodec/wavpack.h
+++ b/libavcodec/wavpack.h
@@ -171,6 +171,8 @@ static av_always_inline int wp_exp2(int16_t val)
res = wp_exp2_table[val & 0xFF] | 0x100;
val >>= 8;
+ if (val > 31)
+ return INT_MIN;
res = (val > 9) ? (res << (val - 9)) : (res >> (9 - val));
return neg ? -res : res;
}