diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-15 14:11:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-15 14:59:20 +0200 |
| commit | 5ad7335ebac2b38bb2a1c8df51a500b78461c05a (patch) | |
| tree | f66d4f64a570f0615793cf6fb9a6cd54b3e780ea | |
| parent | b7027685b89a033e8cca6ca71733da074c3b5f1e (diff) | |
| download | ffmpeg-5ad7335ebac2b38bb2a1c8df51a500b78461c05a.tar.gz | |
indeo5: check tile size in decode_mb_info().
This prevents writing into a too small array if some parameters changed
without the tile being reallocated.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/indeo5.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 50f4dd0c38..d0aea84f5a 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -468,6 +468,12 @@ static int decode_mb_info(IVI5DecContext *ctx, IVIBandDesc *band, ((band->qdelta_present && band->inherit_qdelta) || band->inherit_mv)) return AVERROR_INVALIDDATA; + if( tile->num_MBs != IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size) ){ + av_log(avctx, AV_LOG_ERROR, "allocated tile size %d mismatches parameters %d\n", + tile->num_MBs, IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size)); + return AVERROR_INVALIDDATA; + } + /* scale factor for motion vectors */ mv_scale = (ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3); mv_x = mv_y = 0; |