1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

lcldec: Check length before unsigned subtraction.

Fix integer overflow and out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-24 04:02:14 +01:00
parent 69fb605ad5
commit b53ed19aa7

View File

@ -203,6 +203,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
; ;
} else if (c->flags & FLAG_MULTITHREAD) { } else if (c->flags & FLAG_MULTITHREAD) {
mthread_inlen = AV_RL32(encoded); mthread_inlen = AV_RL32(encoded);
if (len < 8) {
av_log(avctx, AV_LOG_ERROR, "len %d is too small\n", len);
return AVERROR_INVALIDDATA;
}
mthread_inlen = FFMIN(mthread_inlen, len - 8); mthread_inlen = FFMIN(mthread_inlen, len - 8);
mthread_outlen = AV_RL32(encoded+4); mthread_outlen = AV_RL32(encoded+4);
mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);