Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15bee94b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[GWP-ASan] Scan GWP-ASan regions for native allocations." am:... 

Merge "[GWP-ASan] Scan GWP-ASan regions for native allocations." am: b666519a am: 9346552f am: 044bf6dd

Change-Id: I37d4876344d9d016658e8ea698c715b0ef51d60f
parents 08883928 044bf6dd

core/jni/android_os_Debug.cpp

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ static bool load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
            which_heap = HEAP_NATIVE;

        } else if (base::StartsWith(name, "[anon:scudo:")) {

            which_heap = HEAP_NATIVE;

        } else if (base::StartsWith(name, "[anon:GWP-ASan")) {

            which_heap = HEAP_NATIVE;

        } else if (base::StartsWith(name, "[stack")) {

            which_heap = HEAP_STACK;

        } else if (base::StartsWith(name, "[anon:stack_and_tls:")) {