indeo4: Validate scantable dimension
authorLuca Barbato <lu_zero@gentoo.org>
Fri, 12 Jul 2013 16:10:05 +0000 (18:10 +0200)
committerLuca 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

index f1ef02a74cc0c5ac7592465fc21d3d5f560bbe47..dbf24fac2a26130909f5c20e4e5225ab21ab8491 100644 (file)
@@ -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);