commit dac542655c139692b8dce54ac9adcdd55df3edec
author David Turner <digit@google.com> Thu Oct 07 02:50:39 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 07 02:50:39 2010 -0700
tree aef611e0d00802e556a986c4ebb00287f8894b13
parent b55ab95837b2a81449aa0eadac57ff600906550e
parent 9d8be5485c366b4f579bef0b88a4c99b899f21e1

Merge "get_malloc_leak_info: Fix assumption that totalMemory out parameter was initialized to zero."

libc/bionic/malloc_debug_common.c

diff --git a/libc/bionic/malloc_debug_common.c b/libc/bionic/malloc_debug_common.c
index f05576c..ebf0006 100644
--- a/libc/bionic/malloc_debug_common.c
+++ b/libc/bionic/malloc_debug_common.c
@@ -120,6 +120,7 @@
             totalMemory == NULL || backtraceSize == NULL) {
         return;
     }
+    *totalMemory = 0;
 
     pthread_mutex_lock(&gAllocationsMutex);
 
@@ -127,7 +128,6 @@
         *info = NULL;
         *overallSize = 0;
         *infoSize = 0;
-        *totalMemory = 0;
         *backtraceSize = 0;
         goto done;
     }