indeo4: Check the quantization matrix index
authorLuca Barbato <lu_zero@gentoo.org>
Fri, 12 Jul 2013 13:02:33 +0000 (15:02 +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 e5800741a14ed92834a4aac5dde07906e177b4a4..f1ef02a74cc0c5ac7592465fc21d3d5f560bbe47 100644 (file)
@@ -359,6 +359,11 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
                 av_log(avctx, AV_LOG_ERROR, "Custom quant matrix encountered!\n");
                 return AVERROR_INVALIDDATA;
             }
                 av_log(avctx, AV_LOG_ERROR, "Custom quant matrix encountered!\n");
                 return AVERROR_INVALIDDATA;
             }
+            if (band->quant_mat >= FF_ARRAY_ELEMS(quant_index_to_tab)) {
+                avpriv_request_sample(avctx, "Quantization matrix %d",
+                                      band->quant_mat);
+                return AVERROR_INVALIDDATA;
+            }
         }
 
         /* decode block huffman codebook */
         }
 
         /* decode block huffman codebook */