virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/wmalosslessdec: Fix 2 overflows in mclms

Browse Source 
Fixes: signed integer overflow: 2038337026 + 109343477 cannot be represented in type 'int'
Fixes: 18886/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5673660505653248

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
2019-11-20 22:05:40 +01:00
parent 6b7bcd437e
commit 92455c8c65
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/wmalosslessdec.c
View File

@@ -628,7 +628,7 @@ static void mclms_update(WmallDecodeCtx *s, int icoef, int *pred)
int range = 1 << (s->bits_per_sample - 1); int range = 1 << (s->bits_per_sample - 1);
for (ich = 0; ich < num_channels; ich++) { for (ich = 0; ich < num_channels; ich++) {
pred_error = s->channel_residues[ich][icoef] - pred[ich]; pred_error = s->channel_residues[ich][icoef] - (unsigned)pred[ich];
if (pred_error > 0) { if (pred_error > 0) {
for (i = 0; i < order * num_channels; i++) for (i = 0; i < order * num_channels; i++)
s->mclms_coeffs[i + ich * order * num_channels] += s->mclms_coeffs[i + ich * order * num_channels] +=
@@ -680,7 +680,7 @@ static void mclms_predict(WmallDecodeCtx *s, int icoef, int *pred)
s->mclms_coeffs_cur[i + num_channels * ich]; s->mclms_coeffs_cur[i + num_channels * ich];
pred[ich] += (1 << s->mclms_scaling) >> 1; pred[ich] += (1 << s->mclms_scaling) >> 1;
pred[ich] >>= s->mclms_scaling; pred[ich] >>= s->mclms_scaling;
s->channel_residues[ich][icoef] += pred[ich]; s->channel_residues[ich][icoef] += (unsigned)pred[ich];
} }
} }