diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-21 16:53:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-05 23:16:54 +0200 |
| commit | dd373b4027d6bcd04619949d0821943dbe25d6a7 (patch) | |
| tree | f8c76979a4120e26a05a300c50a49aa1f00ddc3d | |
| parent | 8bc5e90bb218aab85791b11d38ae65df958b8c2f (diff) | |
| download | ffmpeg-dd373b4027d6bcd04619949d0821943dbe25d6a7.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>
(cherry picked from commit b5228e44c7f3a5eba537c8a39a45cfbf2961a28d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/aacdec_fixed.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index d154098497..b3d35f1e29 100644 --- a/libavcodec/aacdec_fixed.c +++ b/libavcodec/aacdec_fixed.c @@ -206,7 +206,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); |