diff options
| author | Christopher Ferris <cferris@google.com> | 2016-02-22 18:46:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-22 18:46:35 +0000 |
| commit | f2d516b3f9ef901991387ee473140ea24feaab48 (patch) | |
| tree | ed129781e91ae6015f625930c4c5fdec19265356 | |
| parent | b539baab398ce20f9add5d6dfbadfdc7abdeb970 (diff) | |
| parent | f499dc91e774db4cb9d21f9a7c34704fa9b7ed39 (diff) | |
| download | bionic-brillo-m10-dev.tar.gz | |
Merge "Fix incorrect size of array."brillo-m10-releasebrillo-m10-dev
| -rw-r--r-- | libc/malloc_debug/Android.mk | 1 | ||||
| -rw-r--r-- | libc/malloc_debug/MapData.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libc/malloc_debug/Android.mk b/libc/malloc_debug/Android.mk index fb366430b..3576611f5 100644 --- a/libc/malloc_debug/Android.mk +++ b/libc/malloc_debug/Android.mk @@ -37,7 +37,6 @@ LOCAL_NATIVE_COVERAGE := false LOCAL_CFLAGS := \ -Wall \ -Werror \ - -fno-stack-protector \ -Wno-error=format-zero-length \ include $(BUILD_STATIC_LIBRARY) diff --git a/libc/malloc_debug/MapData.cpp b/libc/malloc_debug/MapData.cpp index 8e9c80643..d57017e34 100644 --- a/libc/malloc_debug/MapData.cpp +++ b/libc/malloc_debug/MapData.cpp @@ -44,7 +44,7 @@ static MapEntry* parse_line(char* line) { 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) { |