ref: 64401f838f6cfa53b73e4507155ba9d64574d4e0
parent: d8e86af263e59b8adf97ed99e552b2ff17d04e5b
parent: 9dc9f07fb8a1452fb123d280741bfbc6469a6ec1
author: Ronald S. Bultje <rbultje@google.com>
date: Tue Jan 29 07:49:22 EST 2013
Merge "Fix overread/write reported by valgrind if (mb_cols) & 3 != 0." into experimental
--- a/vp9/common/vp9_alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -134,7 +134,8 @@
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);
--
⑨