avformat/vividas: Fixes overflow in shift in recover_key()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 28 Jun 2019 19:03:59 +0000 (21:03 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 14 Jul 2019 20:17:43 +0000 (22:17 +0200)
Fixes: left shift of 133 by 24 places cannot be represented in type 'int'
Fixes: 15365/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5716153105645568

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/vividas.c

index 350c7aa..830e318 100644 (file)
@@ -115,10 +115,7 @@ static unsigned recover_key(unsigned char sample[4], unsigned expected_size)
 
     put_v(plaintext+2, expected_size);
 
 
     put_v(plaintext+2, expected_size);
 
-    return (sample[0]^plaintext[0])|
-        ((sample[1]^plaintext[1])<<8)|
-        ((sample[2]^plaintext[2])<<16)|
-        ((sample[3]^plaintext[3])<<24);
+    return AV_RL32(sample) ^ AV_RL32(plaintext);
 }
 
 static void xor_block(void *p1, void *p2, unsigned size, int key, unsigned *key_ptr)
 }
 
 static void xor_block(void *p1, void *p2, unsigned size, int key, unsigned *key_ptr)