aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-12-18 00:07:50 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-02 19:55:09 +0200
commit7a0317e38cdebd673ea0353843f1e76fe9ade1bb (patch)
tree093f2bf180166054da9ac4b4284c1a9f518e5c1f
parent2b57b593b5216f369888aa7672ab4a11b26163ed (diff)
downloadffmpeg-7a0317e38cdebd673ea0353843f1e76fe9ade1bb.tar.gz
avcodec/pcm: Fix invalid shift in pcm_decode_frame for LXF
Fixes: left shift of 32 by 28 places cannot be represented in type 'int' Fixes: 19472/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PCM_LXF_fuzzer-5704364320096256 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 985d3666f672781152f4b68093740ea6a9888194) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index c52ebcd0d6..482cbbe516 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -501,7 +501,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
dst_int32_t = (int32_t *)frame->extended_data[c];
for (i = 0; i < n; i++) {
// extract low 20 bits and expand to 32 bits
- *dst_int32_t++ = (src[2] << 28) |
+ *dst_int32_t++ = ((uint32_t)src[2]<<28) |
(src[1] << 20) |
(src[0] << 12) |
((src[2] & 0x0F) << 8) |