commit 78058d7e8780e778c2e9a0ebd52d0f88795dc150
author Elliott Hughes <enh@google.com> Wed Nov 04 19:06:02 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 04 19:06:02 2015 +0000
tree de1c91d8bd96aa1481eb5169ba47c777fa722e69
parent 91bb8fc627238220d7e54b708bed4301b17fea38
parent 1639b9dbed8db8c2cd23625795b626636b170a02

Merge "Fix adb GCC build (for google3)." am: 834799f01d
am: 86088564de

* commit '86088564de6f688556e7f045e951dccd7b74f18c':
  Fix adb GCC build (for google3).

debuggerd/elf_utils.cpp

diff --git a/debuggerd/elf_utils.cpp b/debuggerd/elf_utils.cpp
index 5ea03e7..65c1904 100644
--- a/debuggerd/elf_utils.cpp
+++ b/debuggerd/elf_utils.cpp
@@ -63,10 +63,10 @@
         if (nhdr.n_type == NT_GNU_BUILD_ID) {
           // Skip the name (which is the owner and should be "GNU").
           addr += NOTE_ALIGN(nhdr.n_namesz);
-          uint8_t build_id_data[128];
-          if (nhdr.n_namesz > sizeof(build_id_data)) {
-            ALOGE("Possible corrupted note, name size value is too large: %u",
-                  nhdr.n_namesz);
+          uint8_t build_id_data[160];
+          if (nhdr.n_descsz > sizeof(build_id_data)) {
+            ALOGE("Possible corrupted note, desc size value is too large: %u",
+                  nhdr.n_descsz);
             return false;
           }
           if (backtrace->Read(addr, build_id_data, nhdr.n_descsz) != nhdr.n_descsz) {