aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-07-12 15:02:33 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-07-13 19:11:18 +0200
commit6255ccf7d51c82ab79bf0cd47a921f572dda4489 (patch)
tree196b28f84541092af0ddcc95e422ad2f9e745c79 /libavcodec
parent8435bca087c0e79385763c51de009fd89390b6a5 (diff)
downloadffmpeg-6255ccf7d51c82ab79bf0cd47a921f572dda4489.tar.gz
indeo4: Check the quantization matrix index
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/indeo4.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index e5800741a1..f1ef02a74c 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -359,6 +359,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)) {
+ avpriv_request_sample(avctx, "Quantization matrix %d",
+ band->quant_mat);
+ return AVERROR_INVALIDDATA;
+ }
}
/* decode block huffman codebook */