Commit aed128f0 authored by Michael Niedermayer's avatar Michael Niedermayer

4xmdec: fix integer overflow, null ptr dereference

 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent ed27ed9f
...@@ -428,7 +428,7 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length) ...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment