From: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed, 10 May 2017 16:51:58 +0000 (+0200)
Subject: avcodec/dss_sp: Fix runtime error: signed integer overflow: 2147481189 + 4096 cannot... 
X-Git-Tag: android-x86-7.1-r1~402
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6ea428789371fa0601e9ebb5b7f2216d4e73e831;p=android-x86%2Fexternal-ffmpeg.git

avcodec/dss_sp: Fix runtime error: signed integer overflow: 2147481189 + 4096 cannot be represented in type 'int'

Fixes: 1441/clusterfuzz-testcase-minimized-6223152357048320

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/dss_sp.c b/libavcodec/dss_sp.c
index 2100936e51..14025fcdde 100644
--- a/libavcodec/dss_sp.c
+++ b/libavcodec/dss_sp.c
@@ -529,7 +529,7 @@ static void dss_sp_shift_sq_sub(const int32_t *filter_buf,
         for (i = 14; i > 0; i--)
             error_buf[i] = error_buf[i - 1];
 
-        tmp = (tmp + 4096) >> 13;
+        tmp = (int)(tmp + 4096U) >> 13;
 
         error_buf[1] = tmp;