MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/vividas: Fixes overflow in shift in recover_key()

Browse Source 
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:
Michael Niedermayer 2019-06-28 21:03:59 +02:00
parent 84669b1872
commit 62d10ec35c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/vividas.c
View File

@ -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)