diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-25 04:09:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-25 04:09:42 +0000 |
| commit | e0664622a17c04bd7b53361f1264401f2141261c (patch) | |
| tree | 3b2cb148b6f29de171cfe03dc22b318b7fc8ae07 /libc/malloc_debug/malloc_debug.cpp | |
| parent | 0879c3166f0ecdcc3004f66c365c1a8548409580 (diff) | |
| parent | cf1a6d902f499e2427ab80ce16ca0aa8ff152105 (diff) | |
Snap for 6160382 from cf1a6d902f499e2427ab80ce16ca0aa8ff152105 to rvc-release
Change-Id: Ib7fb3f9ae5ea2ee05a993e93684e4dbd76195e09
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); } |