Module: libav
Branch: release/9
Commit: 03457cabd618d4de3e64cb890af268fd67b83aec
Author: Luca Barbato <lu_z...@gentoo.org>
Committer: Reinhard Tartler <siret...@tauware.de>
Date: Fri Oct 11 11:34:03 2013 +0200
indeo4: Check the inherited quant_mat
Invalidate it if not supported.
Sample-Id: 00000262-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-sta...@libav.org
(cherry picked from commit c9ef6b09326a24010bf86d6b0d19cfa42df4d546)
Signed-off-by: Reinhard Tartler <siret...@tauware.de>
Conflicts:
libavcodec/indeo4.c
---
libavcodec/indeo4.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 73a7a66..b250f50 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -371,13 +371,17 @@ static int decode_band_hdr(IVI45DecContext *ctx,
IVIBandDesc *band,
band->scan = scan_index_to_tab[scan_indx];
band->quant_mat = get_bits(&ctx->gb, 5);
- if (band->quant_mat == 31) {
- 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);
+
+ if (band->quant_mat == 31)
+ av_log(avctx, AV_LOG_ERROR,
+ "Custom quant matrix encountered!\n");
+ else
+ av_log_ask_for_sample(avctx, "Quantization matrix %d",
+ band->quant_mat);
+ band->quant_mat = -1;
return AVERROR_INVALIDDATA;
}
} else {
@@ -387,6 +391,10 @@ static int decode_band_hdr(IVI45DecContext *ctx,
IVIBandDesc *band,
"inherited\n");
return AVERROR_INVALIDDATA;
}
+ if (band->quant_mat < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid quant_mat inherited\n");
+ return AVERROR_INVALIDDATA;
+ }
}
/* decode block huffman codebook */
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
