| Message ID | 20210217171040.16388-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | cd3ab3a09b7ea19ffef559efd4aae6292e196b42 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/cfhd: Fix negative shift in cfhd_decode() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On Wed, Feb 17, 2021 at 06:10:40PM +0100, Michael Niedermayer wrote: > 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> > --- > libavcodec/cfhd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) will apply [...]
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 {
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> --- libavcodec/cfhd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)