diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-17 00:07:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-02 01:14:38 +0200 |
| commit | 3cfb01607144e4ae642d6d21dea1919195db0a13 (patch) | |
| tree | 0d6e2321a48e3408c7e85ef5b3d72ebfff5b4741 | |
| parent | f832d7361d0329024ae748a0b3b8f864fded3be4 (diff) | |
| download | ffmpeg-3cfb01607144e4ae642d6d21dea1919195db0a13.tar.gz | |
avcodec/takdec: Fix runtime error: signed integer overflow: 8192 * 524308 cannot be represented in type 'int'
Fixes: 1630/clusterfuzz-testcase-minimized-6326111917047808
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 955db411929a9876d3cd016fbbb9c49b6362feba)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/takdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 9a13b8efbe..85ef56644b 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -267,11 +267,11 @@ static int decode_segment(TAKDecContext *s, int8_t mode, int32_t *decoded, int l code = xcodes[mode - 1]; for (i = 0; i < len; i++) { - int x = get_bits_long(gb, code.init); + unsigned x = get_bits_long(gb, code.init); if (x >= code.escape && get_bits1(gb)) { x |= 1 << code.init; if (x >= code.aescape) { - int scale = get_unary(gb, 1, 9); + unsigned scale = get_unary(gb, 1, 9); if (scale == 9) { int scale_bits = get_bits(gb, 3); if (scale_bits > 0) { |