aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-03-29 08:58:49 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-14 23:30:37 +0100
commit85b8a4d2c7f4e2b5ea2ac0ba6f3bbfa12a10708d (patch)
tree3c4616f482ca2b15d6c4d0bc816898173fd9ad92
parentbbbe82b142f26ce54dd55f5589b4d5c436b280df (diff)
downloadffmpeg-85b8a4d2c7f4e2b5ea2ac0ba6f3bbfa12a10708d.tar.gz
avcodec/aacdec_fixed: Fix undefined shift in noise_scale()
Fixes: 13655/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5120559430500352 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 8ea211ab79d646f6d0af0945971ee55f36bfcbc9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/aacdec_fixed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index 26b605b59c..0b0281de4a 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -221,7 +221,7 @@ static void noise_scale(int *coefs, int scale, int band_energy, int len)
}
else {
s = s + 32;
- round = 1 << (s-1);
+ round = s ? 1 << (s-1) : 0;
for (i=0; i<len; i++) {
out = (int)((int64_t)((int64_t)coefs[i] * c + round) >> s);
coefs[i] = out * ssign;