Sample-Id: 00000287-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: [email protected]
---
libavcodec/indeo4.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 042529f..3c749a9 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -293,6 +293,7 @@ static int decode_band_hdr(IVI45DecContext *ctx,
IVIBandDesc *band,
band->is_empty = get_bits1(&ctx->gb);
if (!band->is_empty) {
+ int old_blk_size = band->blk_size;
/* skip header size
* If header size is not given, header size is 4 bytes. */
if (get_bits1(&ctx->gb))
@@ -378,6 +379,13 @@ static int decode_band_hdr(IVI45DecContext *ctx,
IVIBandDesc *band,
band->quant_mat);
return AVERROR_INVALIDDATA;
}
+ } else {
+ if (old_blk_size != band->blk_size) {
+ av_log(avctx, AV_LOG_ERROR,
+ "The band block size does not match the configuration "
+ "inherited\n");
+ return AVERROR_INVALIDDATA;
+ }
}
/* decode block huffman codebook */
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
