commit 06444814c39699beea3e0484ddaea3546882baa3
author Elliott Hughes <enh@google.com> Wed Nov 04 21:24:38 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 04 21:24:38 2015 +0000
tree 3f8176d9888ae426b74d3f4df8aa3d6b5724a81c
parent c9f3043a43f25c5abfebcb77d5e59fcfe65c3b3b
parent bcec0980bef16b3c4ba5af306924c0910dfd40b5

Merge "Fix Mac adb build." am: 8660035010
am: 2176a87b8e

* commit '2176a87b8e0bb9509bce3b69433fe1c74330ee87':
  Fix Mac adb build.

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) {