diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-22 21:21:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-19 15:26:37 +0200 |
| commit | 3ed986522ad5766812ce90ff4605df4b0a33d58d (patch) | |
| tree | b88659180a42368dff8e8b701cac5c698a79b9c0 | |
| parent | f1116294aa3e63105b34f8b70a11146bc9f1e8ab (diff) | |
| download | ffmpeg-3ed986522ad5766812ce90ff4605df4b0a33d58d.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>
| -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 2861a813e1..3583a31210 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -483,7 +483,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] + |