aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-02-17 00:02:04 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-03-14 23:29:51 +0100
commitcd3ab3a09b7ea19ffef559efd4aae6292e196b42 (patch)
tree2f2d1016b24dd59bcfb79ad5d382b331eee1baee /libavcodec
parent07de796b5d1f4db239bd986f553760b868a908f0 (diff)
downloadffmpeg-cd3ab3a09b7ea19ffef559efd4aae6292e196b42.tar.gz
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 <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/cfhd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index dfd56ae6ed..1f2ee853c1 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 {