aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-09-10 01:32:50 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-09-11 13:28:41 +0200
commita295d1870a8cc98e397ec51458ef5ed514ee7ee2 (patch)
treee646d05818f471d48f0ba24f71f63a55d8d1fe29
parentb590758298cc6f7bac710ebaecb99a4de878c7f8 (diff)
downloadffmpeg-a295d1870a8cc98e397ec51458ef5ed514ee7ee2.tar.gz
avcodec/diracdec: Fix overflow in DC computation
Fixes: runtime error: signed integer overflow: 11896 + 2147483646 cannot be represented in type 'int' Fixes: 3053/clusterfuzz-testcase-minimized-6355082062856192 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 b5995856a4236c27f231210bb08d70688e045192) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/diracdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 1498dbde0a..791b7f9928 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1422,7 +1422,7 @@ static void decode_block_params(DiracContext *s, DiracArith arith[8], DiracBlock
if (!block->ref) {
pred_block_dc(block, stride, x, y);
for (i = 0; i < 3; i++)
- block->u.dc[i] += dirac_get_arith_int(arith+1+i, CTX_DC_F1, CTX_DC_DATA);
+ block->u.dc[i] += (unsigned)dirac_get_arith_int(arith+1+i, CTX_DC_F1, CTX_DC_DATA);
return;
}