ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | Thu Apr 28 05:07:25 2022 +0200| [3946cb02fc67a0fdd23ff9e0678b2801fe479463] | committer: Andreas Rheinhardt avformat/jpegxl_probe: Fix potential incorrect and UB shift Fixes Coverity issue #1504273. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3946cb02fc67a0fdd2...

libavformat/jpegxl_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/jpegxl_probe.c b/libavformat/jpegxl_probe.c index 924b529ad5..9cd00da194 100644 --- a/libavformat/jpegxl_probe.c +++ b/libavformat/jpegxl_probe.c @@ -96,10 +96,10 @@ static uint64_t jpegxl_u64(GetBitContext *gb) ret = jxl_bits(12); while (jxl_bits(1)) { if (shift < 60) { - ret |= jxl_bits(8) << shift; + ret |= (uint64_t)jxl_bits(8) << shift; shift += 8; } else { - ret |= jxl_bits(4) << shift; + ret |= (uint64_t)jxl_bits(4) << shift; break; } }