diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-21 04:19:24 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-21 04:19:24 +0000 |
| commit | ada0e9964193097cf6e19a3e9fc93445327c2de0 (patch) | |
| tree | 755db21d2d12727fc7d6df3c7d01eb6dc32cc027 /libc/malloc_debug/malloc_debug.cpp | |
| parent | f0385934fc7d43f61b20c570a518e055fb2e6a5f (diff) | |
| parent | abd97434aa570e4b34036d8e019ea8b3752b7c90 (diff) | |
Snap for 6149042 from abd97434aa570e4b34036d8e019ea8b3752b7c90 to rvc-release
Change-Id: I7d1187b8bae03bf9e94c8d9ffaba7de8e84fca93
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); } |