diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-20 23:47:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-20 23:47:46 +0000 |
| commit | b0df5179399f80bbd804c11cf35e48732eb511ad (patch) | |
| tree | 755db21d2d12727fc7d6df3c7d01eb6dc32cc027 /libc/malloc_debug/malloc_debug.cpp | |
| parent | 7cb820f953237d43d088c6e6457c3f8e6dfcfe66 (diff) | |
| parent | dfdb8f9adaca17cc2b6d72a1cd235d1738ebc8db (diff) | |
Merge "Add tagged pointers to bionic." am: 3460b6c265 am: dfdb8f9ada
Change-Id: I8dccf5444a9a52e53dcbe528e179bf2a35d8fb85
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); } |