[FFmpeg-cvslog] avcodec/mlpdec: Use 64bit for channel layout

Michael Niedermayer git at videolan.org
Mon Mar 21 10:08:29 EET 2022


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Mar 21 00:30:53 2022 +0100| [23e27a360e47b7c7825f3df22c6013d5066829e3] | committer: Michael Niedermayer

avcodec/mlpdec: Use 64bit for channel layout

Fixes: shift exponent 33 is too large for 32-bit type 'int'
Fixes: 45645/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-5651350182035456

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index e3fbaa62c7..5a4d272f78 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -208,7 +208,7 @@ static enum AVChannel thd_channel_layout_extract_channel(uint64_t channel_layout
         return AV_CHAN_NONE;
 
     for (i = 0; i < FF_ARRAY_ELEMS(thd_channel_order); i++)
-        if (channel_layout & (1 << thd_channel_order[i]) && !index--)
+        if (channel_layout & (1ULL << thd_channel_order[i]) && !index--)
             return thd_channel_order[i];
     return AV_CHAN_NONE;
 }



More information about the ffmpeg-cvslog mailing list