virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

avcodec/wmalosslessdec: Fix some integer anomalies

Browse Source 
Fixes: left shift of negative value -341180
Fixes: 18401/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5686380134400000

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d3dee676b8a8ab6752c599e25c9b5461f06a3959)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-10-28 00:12:59 +01:00
parent 7369aa201e
commit 2635bfb2b3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/wmalosslessdec.c
View File

@ -766,7 +766,7 @@ static void revert_cdlms ## bits (WmallDecodeCtx *s, int ch, \
for (ilms = num_lms - 1; ilms >= 0; ilms--) { \ for (ilms = num_lms - 1; ilms >= 0; ilms--) { \
for (icoef = coef_begin; icoef < coef_end; icoef++) { \ for (icoef = coef_begin; icoef < coef_end; icoef++) { \
int##bits##_t *prevvalues = (int##bits##_t *)s->cdlms[ch][ilms].lms_prevvalues; \ int##bits##_t *prevvalues = (int##bits##_t *)s->cdlms[ch][ilms].lms_prevvalues; \
pred = 1 << (s->cdlms[ch][ilms].scaling - 1); \ pred = (1 << s->cdlms[ch][ilms].scaling) >> 1; \
residue = s->channel_residues[ch][icoef]; \ residue = s->channel_residues[ch][icoef]; \
pred += s->dsp.scalarproduct_and_madd_int## bits (s->cdlms[ch][ilms].coefs, \ pred += s->dsp.scalarproduct_and_madd_int## bits (s->cdlms[ch][ilms].coefs, \
prevvalues + s->cdlms[ch][ilms].recent, \ prevvalues + s->cdlms[ch][ilms].recent, \
@ -987,9 +987,9 @@ static int decode_subframe(WmallDecodeCtx *s)
for (j = 0; j < subframe_len; j++) { for (j = 0; j < subframe_len; j++) {
if (s->bits_per_sample == 16) { if (s->bits_per_sample == 16) {
*s->samples_16[c]++ = (int16_t) s->channel_residues[c][j] << padding_zeroes; *s->samples_16[c]++ = (int16_t) s->channel_residues[c][j] * (1 << padding_zeroes);
} else { } else {
*s->samples_32[c]++ = s->channel_residues[c][j] << (padding_zeroes + 8); *s->samples_32[c]++ = s->channel_residues[c][j] * (256 << padding_zeroes);
} }
} }
} }