virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/wmalosslessdec: Fix multiple integer overflows

Browse Source 
Fixes: left shift of 3329 by 20 places cannot be represented in type 'int'
Fixes: signed integer overflow: -199378355 + -1948950833 cannot be represented in type 'int'
Fixes: 19837/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5752565837070336
Fixes: 19839/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5767483265122304

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
2020-01-09 02:06:36 +01:00
parent a3655bb02c
commit 422202516c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/wmalosslessdec.c
View File

@@ -532,7 +532,8 @@ static int decode_channel_residues(WmallDecodeCtx *s, int ch, int tile_size)
i++; i++;
} }
for (; i < tile_size; i++) { for (; i < tile_size; i++) {
int quo = 0, rem, rem_bits, residue; int rem, rem_bits;
unsigned quo = 0, residue;
while(get_bits1(&s->gb)) { while(get_bits1(&s->gb)) {
quo++; quo++;
if (get_bits_left(&s->gb) <= 0) if (get_bits_left(&s->gb) <= 0)
@@ -771,7 +772,7 @@ static void revert_cdlms ## bits (WmallDecodeCtx *s, int ch, \
s->cdlms[ch][ilms].recent, \ s->cdlms[ch][ilms].recent, \
FFALIGN(s->cdlms[ch][ilms].order, ROUND), \ FFALIGN(s->cdlms[ch][ilms].order, ROUND), \
WMASIGN(residue)); \ WMASIGN(residue)); \
input = residue + (pred >> s->cdlms[ch][ilms].scaling); \ input = residue + (unsigned)(pred >> s->cdlms[ch][ilms].scaling); \
lms_update ## bits(s, ch, ilms, input); \ lms_update ## bits(s, ch, ilms, input); \
s->channel_residues[ch][icoef] = input; \ s->channel_residues[ch][icoef] = input; \
} \ } \