generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

4xmdec: fix integer overflow, null ptr dereference

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-20 02:59:55 +01:00
parent ed27ed9f4f
commit aed128f07d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/4xm.c
View File

@ -428,7 +428,7 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length)
bytestream_size = FFMAX(length - bitstream_size - wordstream_size, 0); bytestream_size = FFMAX(length - bitstream_size - wordstream_size, 0);
} }
if (bitstream_size > length || if (bitstream_size > length || bitstream_size >= INT_MAX/8 ||
bytestream_size > length - bitstream_size || bytestream_size > length - bitstream_size ||
wordstream_size > length - bytestream_size - bitstream_size || wordstream_size > length - bytestream_size - bitstream_size ||
extra > length - bytestream_size - bitstream_size - wordstream_size) { extra > length - bytestream_size - bitstream_size - wordstream_size) {