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

Print the corrupted address passed to free().

Browse Source 
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
This commit is contained in:
Ben Cheng 2012-05-24 16:56:53 -07:00
parent 08e72d0161
commit c84ff11dad
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libc/bionic/dlmalloc.c
View File

@ -2290,7 +2290,22 @@ static void reset_on_error(mstate m);
# include <private/logd.h> # 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() /* We format the buffer explicitely, i.e. without using snprintf()
* which may use malloc() internally. Not something we can trust * 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, " IN ", sizeof(buffer));
strlcat(buffer, function, 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); __libc_android_log_write(ANDROID_LOG_FATAL,"libc",buffer);
abort(); abort();
} }
# ifndef CORRUPTION_ERROR_ACTION # ifndef CORRUPTION_ERROR_ACTION
# define CORRUPTION_ERROR_ACTION(m) \ # define CORRUPTION_ERROR_ACTION(m) \
__bionic_heap_error("HEAP MEMORY CORRUPTION", __FUNCTION__) __bionic_heap_error("HEAP MEMORY CORRUPTION", __FUNCTION__, 0)
# endif # endif
# ifndef USAGE_ERROR_ACTION # ifndef USAGE_ERROR_ACTION
# define USAGE_ERROR_ACTION(m,p) \ # define USAGE_ERROR_ACTION(m,p) \
__bionic_heap_error("INVALID HEAP ADDRESS", __FUNCTION__) __bionic_heap_error("INVALID HEAP ADDRESS", __FUNCTION__, p)
# endif # endif
#else /* !LOG_ON_HEAP_ERROR */ #else /* !LOG_ON_HEAP_ERROR */