aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-17 00:07:02 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-21 13:07:14 +0200
commit955db411929a9876d3cd016fbbb9c49b6362feba (patch)
treed84c69c47b1670e0e4ce83367559a5e29b284732
parent3b09d7c264f35ac35a70aeb6b4f076502aa18203 (diff)
downloadffmpeg-955db411929a9876d3cd016fbbb9c49b6362feba.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>
-rw-r--r--libavcodec/takdec.c4
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) {