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

am 63c4179f: am 4d0128f1: Merge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev

Browse Source 
* commit '63c4179f5951edc2d68700fe75659fbd34febe63':
  Minor tweak to get memory around corrupted heap chunks dumped.
This commit is contained in:
Andy McFadden
2012-06-19 11:33:19 -07:00
committed by Android Git Automerger
parent ece8f502ed 63c4179f59
commit f2ba5c9afa
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libc/bionic/dlmalloc.c
View File

@@ -2327,12 +2327,14 @@ static void __bionic_heap_error(const char* msg, const char* function, void* p)
}
__libc_android_log_write(ANDROID_LOG_FATAL,"libc",buffer);
abort();
/* So that we can get a memory dump around p */
*((int **) 0xdeadbaad) = (int *) p;
}
# ifndef CORRUPTION_ERROR_ACTION
# define CORRUPTION_ERROR_ACTION(m) \
__bionic_heap_error("HEAP MEMORY CORRUPTION", __FUNCTION__, 0)
# define CORRUPTION_ERROR_ACTION(m,p) \
__bionic_heap_error("HEAP MEMORY CORRUPTION", __FUNCTION__, p)
# endif
# ifndef USAGE_ERROR_ACTION
# define USAGE_ERROR_ACTION(m,p) \
@@ -2342,7 +2344,7 @@ static void __bionic_heap_error(const char* msg, const char* function, void* p)
#else /* !LOG_ON_HEAP_ERROR */
# ifndef CORRUPTION_ERROR_ACTION
# define CORRUPTION_ERROR_ACTION(m) ABORT
# define CORRUPTION_ERROR_ACTION(m,p) ABORT
# endif /* CORRUPTION_ERROR_ACTION */
# ifndef USAGE_ERROR_ACTION
@@ -3079,7 +3081,7 @@ static void internal_malloc_stats(mstate m) {
else if (RTCHECK(ok_address(M, B->fd)))\
F = B->fd;\
else {\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, B);\
}\
B->fd = P;\
F->bk = P;\
@@ -3096,7 +3098,7 @@ static void internal_malloc_stats(mstate m) {
mchunkptr B = P->bk;\
bindex_t I = small_index(S);\
if (__builtin_expect (F->bk != P || B->fd != P, 0))\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, P);\
assert(P != B);\
assert(P != F);\
assert(chunksize(P) == small_index2size(I));\
@@ -3108,7 +3110,7 @@ static void internal_malloc_stats(mstate m) {
B->fd = F;\
}\
else {\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, P);\
}\
}
@@ -3119,7 +3121,7 @@ static void internal_malloc_stats(mstate m) {
#define unlink_first_small_chunk(M, B, P, I) {\
mchunkptr F = P->fd;\
if (__builtin_expect (F->bk != P || B->fd != P, 0))\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, P);\
assert(P != B);\
assert(P != F);\
assert(chunksize(P) == small_index2size(I));\
@@ -3130,7 +3132,7 @@ static void internal_malloc_stats(mstate m) {
F->bk = B;\
}\
else {\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, P);\
}\
}
@@ -3179,7 +3181,7 @@ static void internal_malloc_stats(mstate m) {
break;\
}\
else {\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, C);\
break;\
}\
}\
@@ -3193,7 +3195,7 @@ static void internal_malloc_stats(mstate m) {
break;\
}\
else {\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, F);\
break;\
}\
}\
@@ -3228,13 +3230,13 @@ static void internal_malloc_stats(mstate m) {
tchunkptr F = X->fd;\
R = X->bk;\
if (__builtin_expect (F->bk != X || R->fd != X, 0))\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, X);\
if (RTCHECK(ok_address(M, F))) {\
F->bk = R;\
R->fd = F;\
}\
else {\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, F);\
}\
}\
else {\
@@ -3249,7 +3251,7 @@ static void internal_malloc_stats(mstate m) {
if (RTCHECK(ok_address(M, RP)))\
*RP = 0;\
else {\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, RP);\
}\
}\
}\
@@ -3266,7 +3268,7 @@ static void internal_malloc_stats(mstate m) {
XP->child[1] = R;\
}\
else\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, XP);\
if (R != 0) {\
if (RTCHECK(ok_address(M, R))) {\
tchunkptr C0, C1;\
@@ -3277,7 +3279,7 @@ static void internal_malloc_stats(mstate m) {
C0->parent = R;\
}\
else\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, C0);\
}\
if ((C1 = X->child[1]) != 0) {\
if (RTCHECK(ok_address(M, C1))) {\
@@ -3285,11 +3287,11 @@ static void internal_malloc_stats(mstate m) {
C1->parent = R;\
}\
else\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, C1);\
}\
}\
else\
CORRUPTION_ERROR_ACTION(M);\
CORRUPTION_ERROR_ACTION(M, R);\
}\
}\
}
@@ -3940,7 +3942,7 @@ static void* tmalloc_large(mstate m, size_t nb) {
return chunk2mem(v);
}
}
CORRUPTION_ERROR_ACTION(m);
CORRUPTION_ERROR_ACTION(m, v);
}
return 0;
}
@@ -3980,7 +3982,7 @@ static void* tmalloc_small(mstate m, size_t nb) {
}
}
CORRUPTION_ERROR_ACTION(m);
CORRUPTION_ERROR_ACTION(m, v);
return 0;
}