about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--malloc/malloc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c39143246..8cc1b1faf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2003-06-18  Ulrich Drepper  <drepper@redhat.com>
 
+	* malloc/malloc.c (public_mALLINFo): Initialize malloc if it
+	hasn't happened yet.
+
 	* sysdeps/unix/sysv/linux/x86_64/register-dump.h (register_dump):
-	Fix completely broken impleentation.  The second parameter is of
+	Fix completely broken implementation.  The second parameter is of
 	type struct ucontext*.
 
 	* sysdeps/x86_64/dl-machine.h (elf_machine_runtime_setup): Always
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 8b862feb5b..5cc3473ae2 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3708,6 +3708,8 @@ struct mallinfo public_mALLINFo()
 {
   struct mallinfo m;
 
+  if(__malloc_initialized < 0)
+    ptmalloc_init ();
   (void)mutex_lock(&main_arena.mutex);
   m = mALLINFo(&main_arena);
   (void)mutex_unlock(&main_arena.mutex);