virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/takdec: Fix integer overflows in decode_subframe()

Browse Source 
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/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2017-09-22 20:45:26 +02:00
parent 3d2da6d585
commit 3dabb9c69d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/takdec.c
View File

@@ -486,10 +486,10 @@ static int decode_subframe(TAKDecContext *s, int32_t *decoded,
v += (unsigned)s->adsp.scalarproduct_int16(&s->residues[i], s->filter, v += (unsigned)s->adsp.scalarproduct_int16(&s->residues[i], s->filter,
filter_order & -16); filter_order & -16);
for (j = filter_order & -16; j < filter_order; j += 4) { for (j = filter_order & -16; j < filter_order; j += 4) {
v += s->residues[i + j + 3] * s->filter[j + 3] + v += s->residues[i + j + 3] * (unsigned)s->filter[j + 3] +
s->residues[i + j + 2] * s->filter[j + 2] + s->residues[i + j + 2] * (unsigned)s->filter[j + 2] +
s->residues[i + j + 1] * s->filter[j + 1] + s->residues[i + j + 1] * (unsigned)s->filter[j + 1] +
s->residues[i + j ] * s->filter[j ]; s->residues[i + j ] * (unsigned)s->filter[j ];
} }
v = (av_clip_intp2(v >> filter_quant, 13) * (1 << dshift)) - (unsigned)*decoded; v = (av_clip_intp2(v >> filter_quant, 13) * (1 << dshift)) - (unsigned)*decoded;
*decoded++ = v; *decoded++ = v;