diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-30 23:28:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-07-08 11:52:25 +0200 |
| commit | 7654e5aa3b6e57f6cf161531af340ae41929fa70 (patch) | |
| tree | 6b43547846494da42d3c7b61e9d3bcd090706461 | |
| parent | 6ddb253f79677e2e0594715b1b91720606b0e331 (diff) | |
| download | ffmpeg-7654e5aa3b6e57f6cf161531af340ae41929fa70.tar.gz | |
avcodec/ilbcdec: Simplify use of unsigned and fix more undefined overflows
Fixes: signed integer overflow: 2147475672 + 8192 cannot be represented in type 'int'
Fixes: 15415/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ILBC_fuzzer-5712074128228352
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 019d729039aaa164152035864d65d77e53df1c98)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ilbcdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c index bba83a5896..a82a27525c 100644 --- a/libavcodec/ilbcdec.c +++ b/libavcodec/ilbcdec.c @@ -724,7 +724,7 @@ static void construct_vector ( int16_t cbvec0[SUBL]; int16_t cbvec1[SUBL]; int16_t cbvec2[SUBL]; - int32_t a32; + unsigned a32; int16_t *gainPtr; int j; @@ -745,9 +745,9 @@ static void construct_vector ( for (j = 0; j < veclen; j++) { a32 = SPL_MUL_16_16(*gainPtr++, cbvec0[j]); a32 += SPL_MUL_16_16(*gainPtr++, cbvec1[j]); - a32 += (unsigned)SPL_MUL_16_16(*gainPtr, cbvec2[j]); + a32 += SPL_MUL_16_16(*gainPtr, cbvec2[j]); gainPtr -= 2; - decvector[j] = (a32 + 8192) >> 14; + decvector[j] = (int)(a32 + 8192) >> 14; } } |