aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-04-26 21:19:13 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-01 12:49:26 +0200
commit015c164cd40e1d069e9f7640079b324cd6ff58db (patch)
treedb52cd0abbedabe8e66c8a7cfcc6bea921188c3e
parent996ca740818e745088020f0ce099191dc23b9f88 (diff)
downloadffmpeg-015c164cd40e1d069e9f7640079b324cd6ff58db.tar.gz
avcodec/wmalosslessdec: Fix integer overflows in revert_inter_ch_decorr()
Fixes: signed integer overflow: -717241856 + -1434459904 cannot be represented in type 'int' Fixes: 21405/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5677143666458624 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e9a4c4fe9918220be492a4a9d74c2293fd706be3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/wmalosslessdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 4c8474b9a5..f0efdba729 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -794,8 +794,8 @@ static void revert_inter_ch_decorr(WmallDecodeCtx *s, int tile_size)
else if (s->is_channel_coded[0] || s->is_channel_coded[1]) {
int icoef;
for (icoef = 0; icoef < tile_size; icoef++) {
- s->channel_residues[0][icoef] -= s->channel_residues[1][icoef] >> 1;
- s->channel_residues[1][icoef] += s->channel_residues[0][icoef];
+ s->channel_residues[0][icoef] -= (unsigned)(s->channel_residues[1][icoef] >> 1);
+ s->channel_residues[1][icoef] += (unsigned) s->channel_residues[0][icoef];
}
}
}