diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-12 18:10:05 +0200 |
|---|---|---|
| committer | Sean McGovern <gseanmcg@gmail.com> | 2013-09-23 18:54:13 -0400 |
| commit | 609345cd5e2a1b6f01a85a2431fcc472971e600e (patch) | |
| tree | 5278c6e3247ba00a33307b863c8db5f3dd31c042 | |
| parent | 06c52faef27e5bded4ceda7e6d1541f9fb20e84c (diff) | |
| download | ffmpeg-609345cd5e2a1b6f01a85a2431fcc472971e600e.tar.gz | |
indeo4: Validate scantable dimension
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit cd78e934c246d1b2510f8fba0abfe40bb75795f6)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -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 c197bf3a79..a3b3c6b2f3 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -354,6 +354,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); |