projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6255ccf
)
indeo4: Validate scantable dimension
author
Luca Barbato
<lu_zero@gentoo.org>
Fri, 12 Jul 2013 16:10:05 +0000
(18:10 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Sat, 13 Jul 2013 17:11:18 +0000
(19:11 +0200)
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
libavcodec/indeo4.c
patch
|
blob
|
history
diff --git
a/libavcodec/indeo4.c
b/libavcodec/indeo4.c
index
f1ef02a
..
dbf24fa
100644
(file)
--- 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);