From: Michael Niedermayer <michael@niedermayer.cc>
Date: Tue, 9 May 2017 23:18:36 +0000 (+0200)
Subject: avcodec/texturedsp: Fix runtime error: left shift of 218 by 24 places cannot be repre... 
X-Git-Tag: android-x86-7.1-r1~418
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2bd8eb05d21b582d627a93852b59cb3cfc305dae;p=android-x86%2Fexternal-ffmpeg.git

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

Fixes: 1428/clusterfuzz-testcase-minimized-5263281793007616

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 6049c96791..49e97c91ae 100644
--- a/libavcodec/texturedsp.c
+++ b/libavcodec/texturedsp.c
@@ -291,7 +291,7 @@ static inline void dxt5_block_internal(uint8_t *dst, ptrdiff_t stride,
                     }
                 }
             }
-            pixel = colors[code & 3] | (alpha << 24);
+            pixel = colors[code & 3] | ((unsigned)alpha << 24);
             code >>= 2;
             AV_WL32(dst + x * 4, pixel);
         }