Merge "Fixed the buffer overflow issue" into experimental

abfd2a48 · Jingning Han · Gerrit Code Review · e6c89a1f · 232ccc2f · abfd2a48
Commit abfd2a48 authored Feb 20, 2013 by Jingning Han Committed by Gerrit Code Review Feb 20, 2013
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -944,7 +944,7 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) {
  vpx_free(cpi->tok);

  {
-    unsigned int tokens = cm->mb_rows * cm->mb_cols * 24 * 16;
+    unsigned int tokens = cm->mb_rows * cm->mb_cols * (24 * 16 + 1);

    CHECK_MEM_ERROR(cpi->tok, vpx_calloc(tokens, sizeof(*cpi->tok)));
  }