Module: libav Branch: release/9 Commit: 4ec5c35850c9ecef57799a5a0fae00166ffe6e70
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Fri Jul 12 18:10:05 2013 +0200 indeo4: Validate scantable dimension Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit cd78e934c246d1b2510f8fba0abfe40bb75795f6) Signed-off-by: Luca Barbato <[email protected]> --- libavcodec/indeo4.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 0f32ab9..8d00e7f 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -353,6 +353,12 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, av_log(avctx, AV_LOG_ERROR, "Custom scan pattern encountered!\n"); return AVERROR_INVALIDDATA; } + if (scan_indx > 4 && scan_indx < 10) { + if (band->blk_size != 4) + return AVERROR_INVALIDDATA; + } else if (band->blk_size != 8) + return AVERROR_INVALIDDATA; + band->scan = scan_index_to_tab[scan_indx]; band->quant_mat = get_bits(&ctx->gb, 5); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
