From: Luca Barbato <lu_zero@gentoo.org>
Date: Sun, 4 Aug 2013 16:48:20 +0000 (+0200)
Subject: bink: Bound check the quantization matrix.
X-Git-Tag: v0.8.9~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c779b5dd0e8ce296aa2125877c8276775b8423e;p=platform%2Fupstream%2Flibav.git

bink: Bound check the quantization matrix.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 9991298f2c4d9022ad56057f15d037e18d454157)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---

diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index f38c030b7..47fcc8117 100644
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -675,6 +675,9 @@ static int read_dct_coeffs(GetBitContext *gb, int32_t block[64], const uint8_t *
         quant_idx = q;
     }
 
+    if (quant_idx >= 16)
+        return AVERROR_INVALIDDATA;
+
     quant = quant_matrices[quant_idx];
 
     block[0] = (block[0] * quant[0]) >> 11;