RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mlpdsp: Fix signed integer overflow, 2nd try 

The outputted bits should match what is used in the lossless check

Fixes: runtime error: signed integer overflow: -538697856 * 256 cannot be represented in type 'int'
Fixes: 4326/clusterfuzz-testcase-minimized-5689449645080576

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-11-20 18:45:45 +01:00
parent 883de7e8b4
commit 97c00edaa0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mlpdsp.c
View File

@ -117,7 +117,7 @@ int32_t ff_mlp_pack_output(int32_t lossless_check_data,
(1U << output_shift[mat_ch]); (1U << output_shift[mat_ch]);
lossless_check_data ^= (sample & 0xffffff) << mat_ch; lossless_check_data ^= (sample & 0xffffff) << mat_ch;
if (is32) if (is32)
*data_32++ = sample * 256; *data_32++ = sample * 256U;
else else
*data_16++ = sample >> 8; *data_16++ = sample >> 8;
} }