From 66daebc9d50d8095bb067138168e57b6a1880a19 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 26 Jan 2013 03:17:19 +0100 Subject: [PATCH] indeo4: check for invalid transform_size blk_size combinations The checks existing previously where not sufficient Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/indeo4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 0766ed489a..b713261fa9 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -387,6 +387,10 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, av_log(avctx, AV_LOG_ERROR, "mismatching scan table!\n"); return AVERROR_INVALIDDATA; } + if (band->transform_size == 8 && band->blk_size < 8) { + av_log(avctx, AV_LOG_ERROR, "mismatching transform_size!\n"); + return AVERROR_INVALIDDATA; + } /* decode block huffman codebook */ if (ff_ivi_dec_huff_desc(&ctx->gb, get_bits1(&ctx->gb), IVI_BLK_HUFF,