summaryrefslogtreecommitdiffstats
path: root/libc/bionic
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-01-30 12:11:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-30 12:11:30 -0800
commit9743d7fb60836229fde0fbdbd9fb87c78eaa00b7 (patch)
tree8a8e375aafc82ff5fdc6592d299e1c041da0832b /libc/bionic
parent9d43c079875ebd2540daccb180e9d6d0fa06061d (diff)
parentfb55511e71900476fd03f9c490dc60269d076d1f (diff)
downloadbionic-9743d7fb60836229fde0fbdbd9fb87c78eaa00b7.zip
bionic-9743d7fb60836229fde0fbdbd9fb87c78eaa00b7.tar.gz
bionic-9743d7fb60836229fde0fbdbd9fb87c78eaa00b7.tar.bz2
am fb55511e: am e1a124e5: Merge "Say explicitly if there were no leaks."
# Via Android Git Automerger (1) and others * commit 'fb55511e71900476fd03f9c490dc60269d076d1f': Say explicitly if there were no leaks.
Diffstat (limited to 'libc/bionic')
-rw-r--r--libc/bionic/malloc_debug_check.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/libc/bionic/malloc_debug_check.cpp b/libc/bionic/malloc_debug_check.cpp
index 18c3ed4..394b8bb 100644
--- a/libc/bionic/malloc_debug_check.cpp
+++ b/libc/bionic/malloc_debug_check.cpp
@@ -437,10 +437,6 @@ extern "C" void *chk_calloc(int nmemb, size_t size) {
}
static void heaptracker_free_leaked_memory() {
- if (gAllocatedBlockCount == 0) {
- return;
- }
-
// Use /proc/self/exe link to obtain the program name for logging
// purposes. If it's not available, we set it to "<unknown>".
char exe[PATH_MAX];
@@ -451,6 +447,11 @@ static void heaptracker_free_leaked_memory() {
exe[count] = '\0';
}
+ if (gAllocatedBlockCount == 0) {
+ log_message("+++ %s did not leak", exe);
+ return;
+ }
+
size_t index = 1;
const size_t total = gAllocatedBlockCount;
while (head != NULL) {