am 999dff0e: am a850ad4c: am e51d75a9: Merge "Clarify the dlmalloc USAGE_ERROR."

* commit '999dff0ef3d92c1e84d12d3b8d8324c5ef441b85':
  Clarify the dlmalloc USAGE_ERROR.
This commit is contained in:
Elliott Hughes 2013-03-25 21:10:49 +00:00 committed by Android Git Automerger
commit 9451037195

View File

@ -47,7 +47,8 @@ static void __bionic_heap_corruption_error(const char* function) {
} }
static void __bionic_heap_usage_error(const char* function, void* address) { static void __bionic_heap_usage_error(const char* function, void* address) {
__libc_format_log(ANDROID_LOG_FATAL, "libc", "@@@ ABORTING: invalid address %p passed to %s", __libc_format_log(ANDROID_LOG_FATAL, "libc",
"@@@ ABORTING: invalid address or address of corrupt block %p passed to %s",
address, function); address, function);
// So that we can get a memory dump around the specific address. // So that we can get a memory dump around the specific address.
*((int**) 0xdeadbaad) = (int*) address; *((int**) 0xdeadbaad) = (int*) address;