diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-24 08:08:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-24 08:08:27 +0000 |
| commit | 772b529ea75c12994e3fd53329bd80bbae5d0e53 (patch) | |
| tree | ece6fabb44f7340285c65dc73f2a83b198d92ea8 /libc/malloc_debug/malloc_debug.cpp | |
| parent | d93c960bd582714a5ded119540e30ce59ae28ba8 (diff) | |
| parent | 7ad836feaa3a629adeeb8e6f7a66bbf70683c97c (diff) | |
Merge "Add tagged pointers to bionic." am: 3ff4245c70 am: 26dfaaf904 am: 7ad836feaa
Change-Id: Ie90f2dfa8397fa195145a86ea23b2176254e4fc0
Diffstat (limited to 'libc/malloc_debug/malloc_debug.cpp')
| -rw-r--r-- | libc/malloc_debug/malloc_debug.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp index c0765a983..6eaac7de8 100644 --- a/libc/malloc_debug/malloc_debug.cpp +++ b/libc/malloc_debug/malloc_debug.cpp @@ -43,6 +43,7 @@ #include <android-base/file.h> #include <android-base/properties.h> #include <android-base/stringprintf.h> +#include <bionic/malloc_tagged_pointers.h> #include <private/bionic_malloc_dispatch.h> #include <private/MallocXmlElem.h> @@ -883,6 +884,7 @@ ssize_t debug_malloc_backtrace(void* pointer, uintptr_t* frames, size_t max_fram if (!(g_debug->config().options() & BACKTRACE)) { return 0; } + pointer = UntagPointer(pointer); return PointerData::GetFrames(pointer, frames, max_frames); } |