1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

avcodec/pcm: Fix invalid shift in AV_CODEC_ID_PCM_LXF

Fixes: left shift of 233 by 24 places cannot be represented in type 'int'
Fixes: 20736/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PCM_LXF_fuzzer-4829212685107200

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-02-20 22:26:18 +01:00
parent d2aff350bc
commit 051d11f659

View File

@ -513,7 +513,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
((src[2] & 0x0F) << 8) | ((src[2] & 0x0F) << 8) |
src[1]; src[1];
// extract high 20 bits and expand to 32 bits // extract high 20 bits and expand to 32 bits
*dst_int32_t++ = (src[4] << 24) | *dst_int32_t++ = ((uint32_t)src[4]<<24) |
(src[3] << 16) | (src[3] << 16) |
((src[2] & 0xF0) << 8) | ((src[2] & 0xF0) << 8) |
(src[4] << 4) | (src[4] << 4) |