Merge commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:41:41 +0000 (13:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:46:54 +0000 (13:46 +0100)
* commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b':
  ffv1: fix out-of-bounds read

The change should be harmless but theres no out of array access before
the change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1enc.c

index e2d3707710f58a9f5d4dc714cd339cba3e6b2e4e..cf2a13dc6bf03f3752a6d766e72c4ed24f1436c1 100644 (file)
@@ -166,7 +166,7 @@ static void find_best_state(uint8_t best_state[256][256],
                     best_len[k]      = len;
                     best_state[i][k] = j;
                 }
-                for (m = 0; m < 256; m++)
+                for (m = 1; m < 256; m++)
                     if (occ[m]) {
                         newocc[      one_state[      m]] += occ[m] * p;
                         newocc[256 - one_state[256 - m]] += occ[m] * (1 - p);