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

am fb55511e: am e1a124e5: Merge "Say explicitly if there were no leaks."

Browse Source 
# Via Android Git Automerger (1) and others
* commit 'fb55511e71900476fd03f9c490dc60269d076d1f':
  Say explicitly if there were no leaks.
This commit is contained in:
Elliott Hughes 2013-01-30 12:11:30 -08:00 committed by Android Git Automerger
commit 9743d7fb60
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/bionic/malloc_debug_check.cpp
View File

@ -437,10 +437,6 @@ extern "C" void *chk_calloc(int nmemb, size_t size) {
} }
static void heaptracker_free_leaked_memory() { static void heaptracker_free_leaked_memory() {
if (gAllocatedBlockCount == 0) {
return;
}
// Use /proc/self/exe link to obtain the program name for logging // Use /proc/self/exe link to obtain the program name for logging
// purposes. If it's not available, we set it to "<unknown>". // purposes. If it's not available, we set it to "<unknown>".
char exe[PATH_MAX]; char exe[PATH_MAX];
@ -451,6 +447,11 @@ static void heaptracker_free_leaked_memory() {
exe[count] = '\0'; exe[count] = '\0';
} }
if (gAllocatedBlockCount == 0) {
log_message("+++ %s did not leak", exe);
return;
}
size_t index = 1; size_t index = 1;
const size_t total = gAllocatedBlockCount; const size_t total = gAllocatedBlockCount;
while (head != NULL) { while (head != NULL) {