summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-28 00:12:59 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-10-29 16:20:33 +0100
commitd3dee676b8a8ab6752c599e25c9b5461f06a3959 (patch)
tree7d42034a2f9b5e59a9612267e34151c2d63a4b9f /libavcodec
parent34e701ff93b664703e1bc1b1a6073fa058b02f34 (diff)
downloadffmpeg-streaming-d3dee676b8a8ab6752c599e25c9b5461f06a3959.zip
ffmpeg-streaming-d3dee676b8a8ab6752c599e25c9b5461f06a3959.tar.gz
avcodec/wmalosslessdec: Fix some integer anomalies
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>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/wmalosslessdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 19bac94..d4f18b9 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -766,7 +766,7 @@ static void revert_cdlms ## bits (WmallDecodeCtx *s, int ch, \
for (ilms = num_lms - 1; ilms >= 0; ilms--) { \
for (icoef = coef_begin; icoef < coef_end; icoef++) { \
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]; \
pred += s->dsp.scalarproduct_and_madd_int## bits (s->cdlms[ch][ilms].coefs, \
prevvalues + s->cdlms[ch][ilms].recent, \
@@ -987,9 +987,9 @@ static int decode_subframe(WmallDecodeCtx *s)
for (j = 0; j < subframe_len; j++) {
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 {
- *s->samples_32[c]++ = s->channel_residues[c][j] << (padding_zeroes + 8);
+ *s->samples_32[c]++ = s->channel_residues[c][j] * (256 << padding_zeroes);
}
}
}
OpenPOWER on IntegriCloud