]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/aacdec_fixed: Fix undefined shift in noise_scale()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 29 Mar 2019 07:58:49 +0000 (08:58 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 25 Apr 2019 12:49:51 +0000 (14:49 +0200)
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>
libavcodec/aacdec_fixed.c

index 2c594c67922050dac5a7f572ea823f2a3cafd830..b051e75709af787f692e470e76d9a0c664ccfd8b 100644 (file)
@@ -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;