diff mbox series

[FFmpeg-devel,2/4] avcodec/argo: Move U, fix shift

Message ID 20210903183913.15255-2-michael@niedermayer.cc
State Accepted
Commit 26659fe53ee9e51dc06ea2384321cc18229f5768
Headers show
Series [FFmpeg-devel,1/4] avcodec/utils: ARGO writes 4x4 blocks without regard to the image dimensions | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Michael Niedermayer Sept. 3, 2021, 6:39 p.m. UTC 
Fixes: left shift of 255 by 24 places cannot be represented in type 'int'
Fixes: 37249/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-5754862984888320

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/argo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul B Mahol Sept. 3, 2021, 6:50 p.m. UTC | #1 
lgtm
Michael Niedermayer Sept. 5, 2021, 8:26 p.m. UTC | #2 
On Fri, Sep 03, 2021 at 08:50:27PM +0200, Paul B Mahol wrote:
> lgtm

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/argo.c b/libavcodec/argo.c
index df9aab92a8..66f3d96480 100644
--- a/libavcodec/argo.c
+++ b/libavcodec/argo.c
@@ -58,7 +58,7 @@  static int decode_pal8(AVCodecContext *avctx, uint32_t *pal)
         return AVERROR_INVALIDDATA;
 
     for (int i = 0; i < count; i++)
-        pal[start + i] = (0xFF << 24U) | bytestream2_get_be24u(gb);
+        pal[start + i] = (0xFFU << 24) | bytestream2_get_be24u(gb);
 
     return 0;
 }