avformat/vividas: Fix invalid shift in decode_key()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 7 Jun 2019 20:56:12 +0000 (22:56 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 21 Jun 2019 16:28:00 +0000 (18:28 +0200)
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

index c99cbd1..5e303b9 100644 (file)
@@ -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;