commit e09e7ed34416f6763e80d87710b4bafe8697df8a
author Christopher Ferris <cferris@google.com> Wed Sep 18 10:30:33 2019 -0700
committer Christopher Ferris <cferris@google.com> Wed Sep 18 16:41:25 2019 -0700
tree 983d6191f29f90736e9e5267868d0dbd9ddccc99
parent 119272b2cb00376ef61be7dc29e44f0aabdb0a8c

Add support for scudo native allocator.

Bug: 137795072

Test: All unit tests pass when using scudo or jemalloc.
Change-Id: I20c71811d9e43663c495a1e51988acfef9fc8584

MemUnreachable.cpp

diff --git a/MemUnreachable.cpp b/MemUnreachable.cpp
index ce937fd..c4add19 100644
--- a/MemUnreachable.cpp
+++ b/MemUnreachable.cpp
@@ -25,6 +25,7 @@
 #include <unordered_map>
 
 #include <android-base/macros.h>
+#include <android-base/strings.h>
 #include <backtrace.h>
 
 #include "Allocator.h"
@@ -250,7 +251,8 @@
     } else if (mapping_name == current_lib) {
       // .rodata or .data section
       globals_mappings.emplace_back(*it);
-    } else if (mapping_name == "[anon:libc_malloc]") {
+    } else if (mapping_name == "[anon:libc_malloc]" ||
+               android::base::StartsWith(mapping_name, "[anon:scudo:")) {
       // named malloc mapping
       heap_mappings.emplace_back(*it);
     } else if (has_prefix(mapping_name, "[anon:dalvik-")) {