cook: expand dither_tab[], and make sure indexes into it don't overflow.
authorRonald S. Bultje <rsbultje@gmail.com>
Fri, 9 Mar 2012 01:09:27 +0000 (17:09 -0800)
committerReinhard Tartler <siretart@tauware.de>
Tue, 13 Mar 2012 22:40:29 +0000 (23:40 +0100)
Fixes overflows in accessing dither_tab[].

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 442c3a8cb1785d74f8e2d7ab35b1862b7088436b)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/cook.c
libavcodec/cookdata.h

index dc4c2ab..7c499f0 100644 (file)
@@ -507,7 +507,11 @@ static inline void expand_category(COOKContext *q, int *category,
 {
     int i;
     for (i = 0; i < q->num_vectors; i++)
-        ++category[category_index[i]];
+    {
+        int idx = category_index[i];
+        if (++category[idx] >= FF_ARRAY_ELEMS(dither_tab))
+            --category[idx];
+    }
 }
 
 /**
index e8d6ebf..6825a44 100644 (file)
@@ -36,8 +36,8 @@ static const int expbits_tab[8] = {
     52,47,43,37,29,22,16,0,
 };
 
-static const float dither_tab[8] = {
-  0.0, 0.0, 0.0, 0.0, 0.0, 0.176777, 0.25, 0.707107,
+static const float dither_tab[9] = {
+  0.0, 0.0, 0.0, 0.0, 0.0, 0.176777, 0.25, 0.707107, 1.0
 };
 
 static const float quant_centroid_tab[7][14] = {