Merge "Fix overread/write reported by valgrind if (mb_cols) & 3 != 0." into experimental

64401f83 · Ronald S. Bultje · Gerrit Code Review · d8e86af2 · 9dc9f07f · 64401f83
Commit 64401f83 authored Jan 29, 2013 by Ronald S. Bultje Committed by Gerrit Code Review Jan 29, 2013
--- a/vp9/common/vp9_alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -134,7 +134,8 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) {

  oci->prev_mi = oci->prev_mip + oci->mode_info_stride + 1;

-  oci->above_context = vpx_calloc(sizeof(ENTROPY_CONTEXT_PLANES) * oci->mb_cols, 1);
+  oci->above_context =
+    vpx_calloc(sizeof(ENTROPY_CONTEXT_PLANES) * (3 + oci->mb_cols), 1);

  if (!oci->above_context) {
    vp9_de_alloc_frame_buffers(oci);