From cd3ab3a09b7ea19ffef559efd4aae6292e196b42 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 17 Feb 2021 00:02:04 +0100 Subject: [PATCH] avcodec/cfhd: Fix negative shift in cfhd_decode() Fixes: left shift of negative value -1 Fixes: 30714/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-4867823371419648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cfhd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index dfd56ae6ed8..1f2ee853c12 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -811,7 +811,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, const uint16_t q = s->quantisation; for (i = 0; i < run; i++) { - *coeff_data |= coeff << 8; + *coeff_data |= coeff * 256; *coeff_data++ *= q; } } else { @@ -842,7 +842,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, const uint16_t q = s->quantisation; for (i = 0; i < run; i++) { - *coeff_data |= coeff << 8; + *coeff_data |= coeff * 256; *coeff_data++ *= q; } } else { -- 2.39.2