aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-09-06 10:46:38 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-01 12:49:26 +0200
commit69000f77bc8c3ae4ba6fcdcce372dfb8bf7a985d (patch)
treeb129127eff63e4c73d5f42c86f5093fd3245f08d
parentdcb101dbd768a173193f10e41cdef8b392eefdcc (diff)
downloadffmpeg-69000f77bc8c3ae4ba6fcdcce372dfb8bf7a985d.tar.gz
avcodec/alac: Fix invalid shifts in 20/24 bps
Fixes: left shift of negative value -256 Fixes: 16892/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALAC_fuzzer-4880802642395136 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 b30c07cc2b9ee5bc52e1782eba9aa40e99085a7e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/alac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index c34b8eb523..34010b0d49 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -394,13 +394,13 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
case 20: {
for (ch = 0; ch < channels; ch++) {
for (i = 0; i < alac->nb_samples; i++)
- alac->output_samples_buffer[ch][i] <<= 12;
+ alac->output_samples_buffer[ch][i] *= 1 << 12;
}}
break;
case 24: {
for (ch = 0; ch < channels; ch++) {
for (i = 0; i < alac->nb_samples; i++)
- alac->output_samples_buffer[ch][i] <<= 8;
+ alac->output_samples_buffer[ch][i] *= 1 << 8;
}}
break;
}