From 1d12d574169cedd68185196e4957597d00fd4681 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 30 Jan 2013 11:38:26 -0800 Subject: [PATCH] Say explicitly if there were no leaks. Otherwise people trying to use this are left wondering "did I not leak, or did the leak checking code not get called when I exited?". Change-Id: If79b225f8a2e24dd69aba1fb836bf9e81bb00efe --- libc/bionic/malloc_debug_check.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libc/bionic/malloc_debug_check.cpp b/libc/bionic/malloc_debug_check.cpp index 18c3ed4c3..394b8bb0f 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 "". 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) {