aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-21 16:53:55 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-21 16:54:25 +0200
commitb5228e44c7f3a5eba537c8a39a45cfbf2961a28d (patch)
tree903613f28169a4f63a15d94b2aad689708ed9dfa /libavcodec
parentefeb47fd5d5cbf980e52a6d5e741c3c74b94b5e2 (diff)
downloadffmpeg-b5228e44c7f3a5eba537c8a39a45cfbf2961a28d.tar.gz
avcodec/aacdec_fixed: Fix runtime error: shift exponent 34 is too large for 32-bit type 'int'
Fixes: 1721/clusterfuzz-testcase-minimized-4719352135811072 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/aacdec_fixed.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index b416cf1d25..7b5e40e484 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -207,7 +207,11 @@ static void noise_scale(int *coefs, int scale, int band_energy, int len)
c /= band_energy;
s = 21 + nlz - (s >> 2);
- if (s > 0) {
+ if (s > 31) {
+ for (i=0; i<len; i++) {
+ coefs[i] = 0;
+ }
+ } else if (s > 0) {
round = 1 << (s-1);
for (i=0; i<len; i++) {
out = (int)(((int64_t)coefs[i] * c) >> 32);