aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-09-03 17:12:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-08 21:31:50 +0200
commit34aad0245725ac91a62c4ce45474b4f8b452e303 (patch)
tree97702abdd96c8bbee1d2955ed67cf38e01dd00a5
parent3d5f361290abcc16f6b003bab6ad84ad05aad2b0 (diff)
downloadffmpeg-34aad0245725ac91a62c4ce45474b4f8b452e303.tar.gz
avcodec/argo: Move U, fix shift
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 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 26659fe53ee9e51dc06ea2384321cc18229f5768) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/argo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/argo.c b/libavcodec/argo.c
index 7074561956..f633ec2691 100644
--- a/libavcodec/argo.c
+++ b/libavcodec/argo.c
@@ -59,7 +59,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;
}