commit 9f479f24d9ffac9a9c3f8412b30aba438ea47674
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 18:43:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 18:43:24 2020 +0000
tree 6393713c939698f7e438e344d0ee5f5b9a051b6c
parent b30a3f4990a8e62391ae01c481fb4ca0344d1852
parent 56c0a4bcf7aeb67d294f2e790b321ba4b2ee28a4

[GWP-ASan] Scan GWP-ASan regions for native allocations. am: 56c0a4bcf7

Change-Id: Id47de5f31e19a9f6775d063454c043c35cd5b46f

MemUnreachable.cpp

diff --git a/MemUnreachable.cpp b/MemUnreachable.cpp
index c4add19..b02a77e 100644
--- a/MemUnreachable.cpp
+++ b/MemUnreachable.cpp
@@ -252,7 +252,8 @@
       // .rodata or .data section
       globals_mappings.emplace_back(*it);
     } else if (mapping_name == "[anon:libc_malloc]" ||
-               android::base::StartsWith(mapping_name, "[anon:scudo:")) {
+               android::base::StartsWith(mapping_name, "[anon:scudo:") ||
+               android::base::StartsWith(mapping_name, "[anon:GWP-ASan")) {
       // named malloc mapping
       heap_mappings.emplace_back(*it);
     } else if (has_prefix(mapping_name, "[anon:dalvik-")) {