From: Michael Niedermayer <michael@niedermayer.cc>
Date: Thu, 11 May 2017 13:13:53 +0000 (+0200)
Subject: avcodec/aacdec_fixed: Fix multiple shift exponent 33 is too large for 32-bit type... 
X-Git-Tag: android-x86-7.1-r1~386
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a0ff78168f80f5b2c5c5544325aca4023bc67a4;p=android-x86%2Fexternal-ffmpeg.git

avcodec/aacdec_fixed: Fix multiple shift exponent 33 is too large for 32-bit type 'int'

Fixes: 1471/clusterfuzz-testcase-minimized-6376460543590400

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index e3c68a9767..9580370e7d 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -171,7 +171,11 @@ static void subband_scale(int *dst, int *src, int scale, int offset, int len)
 
     s = offset - (s >> 2);
 
-    if (s > 0) {
+    if (s > 31) {
+        for (i=0; i<len; i++) {
+            dst[i] = 0;
+        }
+    } else if (s > 0) {
         round = 1 << (s-1);
         for (i=0; i<len; i++) {
             out = (int)(((int64_t)src[i] * c) >> 32);