diff options
author | Ben Cheng <bccheng@google.com> | 2012-05-24 16:56:53 -0700 |
---|---|---|
committer | Ben Cheng <bccheng@google.com> | 2012-05-24 17:06:43 -0700 |
commit | c84ff11dad26435dc5760bceda18e8f1175a6061 (patch) | |
tree | b98c5e82098b71100b9ccf082b9913628d77142a /libc/bionic/dlmalloc.c | |
parent | 08e72d0161e39e99ff1003bf1ce894f37d7b7eb4 (diff) | |
download | android_bionic-c84ff11dad26435dc5760bceda18e8f1175a6061.tar.gz android_bionic-c84ff11dad26435dc5760bceda18e8f1175a6061.tar.bz2 android_bionic-c84ff11dad26435dc5760bceda18e8f1175a6061.zip |
Print the corrupted address passed to free().
For example:
@@@ ABORTING: INVALID HEAP ADDRESS IN dlfree addr=0x5c3bfbd0
Fatal signal 11 (SIGSEGV) at 0xdeadbaad (code=1), thread 2942
The addr=0x5c3bfbd0 part is new.
Change-Id: I8670144b2b0a3a6182384150d762c97dfee5452f
Diffstat (limited to 'libc/bionic/dlmalloc.c')
-rw-r--r-- | libc/bionic/dlmalloc.c | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/libc/bionic/dlmalloc.c b/libc/bionic/dlmalloc.c index 98ea9e93b..ec76acffc 100644 --- a/libc/bionic/dlmalloc.c +++ b/libc/bionic/dlmalloc.c @@ -2290,7 +2290,22 @@ static void reset_on_error(mstate m); # include <private/logd.h> -static void __bionic_heap_error(const char* msg, const char* function) +/* Convert a pointer into hex string */ +static void __bionic_itox(char* hex, void* ptr) +{ + intptr_t val = (intptr_t) ptr; + /* Terminate with NULL */ + hex[8] = 0; + int i; + + for (i = 7; i >= 0; i--) { + int digit = val & 15; + hex[i] = (digit <= 9) ? digit + '0' : digit - 10 + 'a'; + val >>= 4; + } +} + +static void __bionic_heap_error(const char* msg, const char* function, void* p) { /* We format the buffer explicitely, i.e. without using snprintf() * which may use malloc() internally. Not something we can trust @@ -2303,17 +2318,25 @@ static void __bionic_heap_error(const char* msg, const char* function) strlcat(buffer, " IN ", sizeof(buffer)); strlcat(buffer, function, sizeof(buffer)); } + + if (p != NULL) { + char hexbuffer[9]; + __bionic_itox(hexbuffer, p); + strlcat(buffer, " addr=0x", sizeof(buffer)); + strlcat(buffer, hexbuffer, sizeof(buffer)); + } + __libc_android_log_write(ANDROID_LOG_FATAL,"libc",buffer); abort(); } # ifndef CORRUPTION_ERROR_ACTION # define CORRUPTION_ERROR_ACTION(m) \ - __bionic_heap_error("HEAP MEMORY CORRUPTION", __FUNCTION__) + __bionic_heap_error("HEAP MEMORY CORRUPTION", __FUNCTION__, 0) # endif # ifndef USAGE_ERROR_ACTION # define USAGE_ERROR_ACTION(m,p) \ - __bionic_heap_error("INVALID HEAP ADDRESS", __FUNCTION__) + __bionic_heap_error("INVALID HEAP ADDRESS", __FUNCTION__, p) # endif #else /* !LOG_ON_HEAP_ERROR */ |