Module: libav
Branch: release/9
Commit: be71990da6bdf13f35d1b0193e109f6de07908bf
Author: Luca Barbato <lu_z...@gentoo.org>
Committer: Luca Barbato <lu_z...@gentoo.org>
Date: Fri Jul 12 15:02:33 2013 +0200
indeo4: Check the quantization matrix index
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-sta...@libav.org
(cherry picked from commit 6255ccf7d51c82ab79bf0cd47a921f572dda4489)
Signed-off-by: Luca Barbato <lu_z...@gentoo.org>
---
libavcodec/indeo4.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index b2dd7e8..0f32ab9 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -360,6 +360,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 */
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
