Commit c7ad616d authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/takdec: Fix integer overflows in decode_subframe()

Fixes: runtime error: signed integer overflow: -1562477869 + -691460395 cannot be represented in type 'int'
Fixes: 3196/clusterfuzz-testcase-minimized-4528307146063872

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3dabb9c6)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 74335435
......@@ -484,10 +484,10 @@ static int decode_subframe(TAKDecContext *s, int32_t *decoded,
v += (unsigned)s->adsp.scalarproduct_int16(&s->residues[i], s->filter,
filter_order & -16);
for (j = filter_order & -16; j < filter_order; j += 4) {
v += s->residues[i + j + 3] * s->filter[j + 3] +
s->residues[i + j + 2] * s->filter[j + 2] +
s->residues[i + j + 1] * s->filter[j + 1] +
s->residues[i + j ] * s->filter[j ];
v += s->residues[i + j + 3] * (unsigned)s->filter[j + 3] +
s->residues[i + j + 2] * (unsigned)s->filter[j + 2] +
s->residues[i + j + 1] * (unsigned)s->filter[j + 1] +
s->residues[i + j ] * (unsigned)s->filter[j ];
}
v = (av_clip_intp2(v >> filter_quant, 13) * (1 << dshift)) - (unsigned)*decoded;
*decoded++ = v;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment