generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "malloc_usable_size returns the original size." into lmp-dev

Browse Source
This commit is contained in:
Christopher Ferris 2014-08-14 21:43:11 +00:00 committed by Android (Google) Code Review
commit 0533195e16
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/bionic/malloc_debug_leak.cpp
View File

@ -481,11 +481,15 @@ extern "C" size_t leak_malloc_usable_size(const void* mem) {
return 0; 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); size_t ret = g_malloc_dispatch->malloc_usable_size(header);
if (ret != 0) { if (ret != 0) {
// The usable area starts at 'mem' and stops at 'header+ret'. // The usable area starts at 'mem' and stops at 'header+ret'.
return reinterpret_cast<uintptr_t>(header) + ret - reinterpret_cast<uintptr_t>(mem); return reinterpret_cast<uintptr_t>(header) + ret - reinterpret_cast<uintptr_t>(mem);
} }
#endif
} }
return 0; return 0;
} }