diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-12 15:02:33 +0200 |
|---|---|---|
| committer | Sean McGovern <gseanmcg@gmail.com> | 2013-09-23 18:53:01 -0400 |
| commit | 06c52faef27e5bded4ceda7e6d1541f9fb20e84c (patch) | |
| tree | df929cab4607d69f787928dee02cd8375c7ab414 | |
| parent | ba5dfc25ee0afeb4b690de873ee17f0960160619 (diff) | |
| download | ffmpeg-06c52faef27e5bded4ceda7e6d1541f9fb20e84c.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 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 */ |