highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/alac: Fix integer overflow with 24/20bps samples

Browse Source 
Fixes: signed integer overflow: 1020048 * 4096 cannot be represented in type 'int'
Fixes: 20492/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALAC_fuzzer-5753877751660544

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 22e51e95ac)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2020-05-10 11:08:28 +02:00
parent f65d68abd9
commit 5325e60e47
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/alac.c
View File

@ -397,13 +397,13 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
case 20: { case 20: {
for (ch = 0; ch < channels; ch++) { for (ch = 0; ch < channels; ch++) {
for (i = 0; i < alac->nb_samples; i++) for (i = 0; i < alac->nb_samples; i++)
alac->output_samples_buffer[ch][i] *= 1 << 12; alac->output_samples_buffer[ch][i] *= 1U << 12;
}} }}
break; break;
case 24: { case 24: {
for (ch = 0; ch < channels; ch++) { for (ch = 0; ch < channels; ch++) {
for (i = 0; i < alac->nb_samples; i++) for (i = 0; i < alac->nb_samples; i++)
alac->output_samples_buffer[ch][i] *= 1 << 8; alac->output_samples_buffer[ch][i] *= 1U << 8;
}} }}
break; break;
} }