diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-16 14:30:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-16 15:27:39 +0200 |
| commit | 474e31c904f766b6989fe614c3fb093e697c847f (patch) | |
| tree | 2c2902bab74eb0f37d0b0186030fa73c30d19ac0 /libavformat/4xm.c | |
| parent | e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0 (diff) | |
| download | ffmpeg-474e31c904f766b6989fe614c3fb093e697c847f.tar.gz | |
4xmdemux: Check chunk size
Fixes over reading the header array
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/4xm.c')
| -rw-r--r-- | libavformat/4xm.c | 4 |
1 files changed, 4 insertions, 0 deletions
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])); |