[FFmpeg-cvslog] avcodec/pcm: Fix invalid shift in AV_CODEC_ID_PCM_LXF

Michael Niedermayer git at videolan.org
Fri Feb 21 23:19:33 EET 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Feb 20 22:26:18 2020 +0100| [051d11f659455f38be7ce40e2dc9d03b082dcd4d] | committer: Michael Niedermayer

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 at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=051d11f659455f38be7ce40e2dc9d03b082dcd4d
---

 libavcodec/pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 6346510de0..96a68f7fe8 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -513,7 +513,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) |



More information about the ffmpeg-cvslog mailing list