diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-22 21:21:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-23 03:05:45 +0200 |
| commit | 7fadd9625f71fa05d9885e0cee6bbc579c4753db (patch) | |
| tree | 988c24128a204fd963c272e842658f9b3afc6cfc /libavcodec | |
| parent | be92b27024482579e42c767b2f5af319f932d0ec (diff) | |
| download | ffmpeg-7fadd9625f71fa05d9885e0cee6bbc579c4753db.tar.gz | |
avcodec/takdec: Fix integer overflow
Fixes: runtime error: signed integer overflow: 512 + 2147483146 cannot be represented in type 'int'
Fixes: 2314/clusterfuzz-testcase-minimized-4519333877252096
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 0c2ef4f6b4d52a7b7184c747ffea3576926ea1b1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/takdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index fd4c6483d2..1de23fbcf1 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -469,7 +469,7 @@ static int decode_subframe(TAKDecContext *s, int32_t *decoded, int v = 1 << (filter_quant - 1); if (filter_order & -16) - v += s->adsp.scalarproduct_int16(&s->residues[i], s->filter, + 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] + |