From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sun, 7 May 2017 01:27:17 +0000 (+0200)
Subject: avcodec/texturedsp: Fix multiple runtime error: left shift of 255 by 24 places cannot... 
X-Git-Tag: android-x86-7.1-r1~486
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e92fb2bea1800b987ebc3cbeef9d48cfe4bcd191;p=android-x86%2Fexternal-ffmpeg.git

avcodec/texturedsp: Fix multiple runtime error: left shift of 255 by 24 places cannot be represented in type 'int'

Fixes: 1386/clusterfuzz-testcase-minimized-5323086394032128

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/texturedsp.c b/libavcodec/texturedsp.c
index 5012245a26..6049c96791 100644
--- a/libavcodec/texturedsp.c
+++ b/libavcodec/texturedsp.c
@@ -35,7 +35,7 @@
 #define RGBA(r, g, b, a) (((uint8_t)(r) <<  0) | \
                           ((uint8_t)(g) <<  8) | \
                           ((uint8_t)(b) << 16) | \
-                          ((uint8_t)(a) << 24))
+                          ((unsigned)(uint8_t)(a) << 24))
 
 static av_always_inline void extract_color(uint32_t colors[4],
                                            uint16_t color0,