diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-10-11 11:34:03 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-10-13 01:38:21 +0200 |
| commit | c9ef6b09326a24010bf86d6b0d19cfa42df4d546 (patch) | |
| tree | 8a44efa9d24e7d737da1a85844c58a3a2f2309ca /libavcodec/indeo4.c | |
| parent | 0cb83c563848bf8f8365e7bd30e7e6b57ef360f0 (diff) | |
| download | ffmpeg-c9ef6b09326a24010bf86d6b0d19cfa42df4d546.tar.gz | |
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-stable@libav.org
Diffstat (limited to 'libavcodec/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 3c749a9b8b..6a19955bce 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -370,13 +370,15 @@ 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)) { - avpriv_request_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 + avpriv_request_sample(avctx, "Quantization matrix %d", + band->quant_mat); + band->quant_mat = -1; return AVERROR_INVALIDDATA; } } else { @@ -386,6 +388,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 */ |