diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-12 18:10:05 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-13 19:11:18 +0200 |
| commit | cd78e934c246d1b2510f8fba0abfe40bb75795f6 (patch) | |
| tree | 7f1cc38af33c70139bf2ce4aa55399f5dd111514 /libavcodec/indeo4.c | |
| parent | 6255ccf7d51c82ab79bf0cd47a921f572dda4489 (diff) | |
indeo4: Validate scantable dimension
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index f1ef02a74c..dbf24fac2a 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -352,6 +352,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); |