Browse Source

cook: expand dither_tab[], and make sure indexes into it don't overflow.

Fixes overflows in accessing dither_tab[].

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
tags/n0.11
Ronald S. Bultje 13 years ago
parent
commit
442c3a8cb1
2 changed files with 7 additions and 3 deletions
  1. +5
    -1
      libavcodec/cook.c
  2. +2
    -2
      libavcodec/cookdata.h

+ 5
- 1
libavcodec/cook.c View 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];
}
}

/**


+ 2
- 2
libavcodec/cookdata.h View 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] = {


Loading…
Cancel
Save