commit f2d516b3f9ef901991387ee473140ea24feaab48
author Christopher Ferris <cferris@google.com> Mon Feb 22 18:46:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 22 18:46:35 2016 +0000
tree ed129781e91ae6015f625930c4c5fdec19265356
parent b539baab398ce20f9add5d6dfbadfdc7abdeb970
parent f499dc91e774db4cb9d21f9a7c34704fa9b7ed39

Merge "Fix incorrect size of array."

libc/malloc_debug/Android.mk

diff --git a/libc/malloc_debug/Android.mk b/libc/malloc_debug/Android.mk
index fb36643..3576611 100644
--- a/libc/malloc_debug/Android.mk
+++ b/libc/malloc_debug/Android.mk
@@ -37,7 +37,6 @@
 LOCAL_CFLAGS := \
     -Wall \
     -Werror \
-    -fno-stack-protector \
     -Wno-error=format-zero-length \
 
 include $(BUILD_STATIC_LIBRARY)

libc/malloc_debug/MapData.cpp

diff --git a/libc/malloc_debug/MapData.cpp b/libc/malloc_debug/MapData.cpp
index 8e9c806..d57017e 100644
--- a/libc/malloc_debug/MapData.cpp
+++ b/libc/malloc_debug/MapData.cpp
@@ -44,7 +44,7 @@
   uintptr_t start;
   uintptr_t end;
   uintptr_t offset;
-  char permissions[4];
+  char permissions[5];
   int name_pos;
   if (sscanf(line, "%" PRIxPTR "-%" PRIxPTR " %4s %" PRIxPTR " %*x:%*x %*d %n", &start,
              &end, permissions, &offset, &name_pos) < 2) {