diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-12 15:02:33 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-08-24 12:08:59 +0200 |
| commit | be71990da6bdf13f35d1b0193e109f6de07908bf (patch) | |
| tree | abe9feea375d9192c4dd0d0ac1af8a172c9d516d | |
| parent | 99d82a07e7dc481ac66dac6e7280ae859f03e14a (diff) | |
| download | ffmpeg-be71990da6bdf13f35d1b0193e109f6de07908bf.tar.gz | |
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 <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/indeo4.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index b2dd7e8b84..0f32ab966a 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 */ |