From 06c52faef27e5bded4ceda7e6d1541f9fb20e84c Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Fri, 12 Jul 2013 15:02:33 +0200 Subject: [PATCH] indeo4: Check the quantization matrix index Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 6255ccf7d51c82ab79bf0cd47a921f572dda4489) Signed-off-by: Luca Barbato --- libavcodec/indeo4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 24f5ce6096..c197bf3a79 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -361,6 +361,11 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, av_log(avctx, AV_LOG_ERROR, "Custom quant matrix encountered!\n"); return AVERROR_INVALIDDATA; } + if (band->quant_mat >= FF_ARRAY_ELEMS(quant_index_to_tab)) { + av_log_ask_for_sample(avctx, "Quantization matrix %d", + band->quant_mat); + return AVERROR_INVALIDDATA; + } } /* decode block huffman codebook */