har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/aacdec_fixed: Handle more extreem cases in noise_scale()

Browse Source 
Its unclear if these cases have any relevance in real files

Fixes: shift exponent -2 is negative
Fixes: 14489/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5681941631729664

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3d14663f8345a84613b1ec041fd65e4a90057320)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-05-16 12:00:18 +02:00
parent cf372260d8
commit 7c6bc6c84c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/aacdec_fixed.c
View File

@ -221,10 +221,15 @@ static void noise_scale(int *coefs, int scale, int band_energy, int len)
} }
else { else {
s = s + 32; s = s + 32;
round = s ? 1 << (s-1) : 0; if (s > 0) {
for (i=0; i<len; i++) { round = 1 << (s-1);
out = (int)((int64_t)((int64_t)coefs[i] * c + round) >> s); for (i=0; i<len; i++) {
coefs[i] = -out; out = (int)((int64_t)((int64_t)coefs[i] * c + round) >> s);
coefs[i] = -out;
}
} else {
for (i=0; i<len; i++)
coefs[i] = -(int64_t)coefs[i] * c * (1 << -s);
} }
} }
} }