[FFmpeg-devel,2/3] avformat/vividas: Fix invalid shift in decode_key()

Submitted by Michael Niedermayer on June 7, 2019, 9:56 p.m.

Details

Message ID 20190607215619.20992-2-michael@niedermayer.cc
State Accepted
Commit 8c6c2747bc85afcf97de855d6e86a12ff9ffc0bd
Headers show

Commit Message

Michael Niedermayer June 7, 2019, 9:56 p.m.
Fixes: left shift of 1 by 31 places cannot be represented in type 'int'
Fixes: 15118/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5740230004441088

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/vividas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index c99cbd1f6e..5e303b9c52 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -91,7 +91,7 @@  static uint32_t decode_key(uint8_t *buf)
 
     for (int i = 0; i < 32; i++) {
         unsigned p = keybits[i];
-        key |= !!(buf[p>>3] & (1<<(p&7))) << i;
+        key |= (unsigned)!!(buf[p>>3] & (1<<(p&7))) << i;
     }
 
     return key;