summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-06-07 22:56:12 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-06-21 18:28:00 +0200
commit8c6c2747bc85afcf97de855d6e86a12ff9ffc0bd (patch)
tree07a0e57e09a2d3d55d7943b25a5624d3f728e032
parent06a90cc78385d87b346be23efc9081eb08936c18 (diff)
avformat/vividas: Fix invalid shift in decode_key()
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>
-rw-r--r--libavformat/vividas.c2
1 files changed, 1 insertions, 1 deletions
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;