mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
avformat/vividas: Fixes overflow in shift in recover_key()
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>
This commit is contained in:
parent
84669b1872
commit
62d10ec35c
@ -115,10 +115,7 @@ static unsigned recover_key(unsigned char sample[4], unsigned 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)
|
||||
|
Loading…
Reference in New Issue
Block a user