diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-02-20 22:26:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-19 17:17:35 +0200 |
| commit | 85705482f2ed984019c701ff7f8a5c5ba00ee48a (patch) | |
| tree | 51cf61109769dfa0e145cb339b4190f09bf71498 | |
| parent | f10514b5e66e1eb9845a0b4c26370cd706aa0c66 (diff) | |
| download | ffmpeg-85705482f2ed984019c701ff7f8a5c5ba00ee48a.tar.gz | |
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>
(cherry picked from commit 051d11f659455f38be7ce40e2dc9d03b082dcd4d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 1922eae7de..95dd86ac12 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -521,7 +521,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, ((src[2] & 0x0F) << 8) | src[1]; // 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[2] & 0xF0) << 8) | (src[4] << 4) | |