From 474e31c904f766b6989fe614c3fb093e697c847f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 16 Apr 2012 14:30:33 +0200 Subject: [PATCH] 4xmdemux: Check chunk size Fixes over reading the header array Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavformat/4xm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/4xm.c b/libavformat/4xm.c index ef87b3b23a..19ebffda1a 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -128,6 +128,10 @@ static int fourxm_read_header(AVFormatContext *s) for (i = 0; i < header_size - 8; i++) { fourcc_tag = AV_RL32(&header[i]); size = AV_RL32(&header[i + 4]); + if (size > header_size - i - 8 && (fourcc_tag == vtrk_TAG || fourcc_tag == strk_TAG)) { + av_log(s, AV_LOG_ERROR, "chunk larger than array %d>%d\n", size, header_size - i - 8); + return AVERROR_INVALIDDATA; + } if (fourcc_tag == std__TAG) { fourxm->fps = av_int2float(AV_RL32(&header[i + 12]));