diff options
| author | Christopher Ferris <cferris@google.com> | 2014-08-14 12:48:04 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-08-14 12:48:04 -0700 |
| commit | 59c1ee44d0a560a754513fab12641c8a57a20d9e (patch) | |
| tree | c8068e59e96b5fdfc4f2d70bec7a6c4819637dbf /libc | |
| parent | 8a84d383fb74135e928d341baa180c55854f2f42 (diff) | |
| download | bionic-59c1ee44d0a560a754513fab12641c8a57a20d9e.zip bionic-59c1ee44d0a560a754513fab12641c8a57a20d9e.tar.gz bionic-59c1ee44d0a560a754513fab12641c8a57a20d9e.tar.bz2 | |
malloc_usable_size returns the original size.
Bug: 16874447
Change-Id: Ie3ce683fd1f58b837b8ea91dc798e561b8593356
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bionic/malloc_debug_leak.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/bionic/malloc_debug_leak.cpp b/libc/bionic/malloc_debug_leak.cpp index 837dccc..27b6714 100644 --- a/libc/bionic/malloc_debug_leak.cpp +++ b/libc/bionic/malloc_debug_leak.cpp @@ -481,11 +481,15 @@ extern "C" size_t leak_malloc_usable_size(const void* mem) { return 0; } + // TODO: Temporary workaround to avoid a crash b/16874447. + return header->entry->size & ~SIZE_FLAG_MASK; +#if 0 size_t ret = g_malloc_dispatch->malloc_usable_size(header); if (ret != 0) { // The usable area starts at 'mem' and stops at 'header+ret'. return reinterpret_cast<uintptr_t>(header) + ret - reinterpret_cast<uintptr_t>(mem); } +#endif } return 0; } |