about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2004-09-29 08:48:32 +0000
committerJakub Jelinek <jakub@redhat.com>2004-09-29 08:48:32 +0000
commit2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16 (patch)
tree4d407d9cf3aaa05d597017bf8c326fda4e960f66 /malloc
parentf1750fb9c68854778e6e023ed490ff80e1c90167 (diff)
downloadglibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.tar.gz
glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.tar.xz
glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.zip
Updated to fedora-glibc-20040929T0821
Diffstat (limited to 'malloc')
-rw-r--r--malloc/arena.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/malloc/arena.c b/malloc/arena.c
index 16574e1f7d..3adfbc45f8 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -495,7 +495,8 @@ ptmalloc_init (void)
 #endif
   if(s) {
     if(s[0]) mALLOPt(M_CHECK_ACTION, (int)(s[0] - '0'));
-    __malloc_check_init();
+    if (check_action != 0)
+      __malloc_check_init();
   }
   if(__malloc_initialize_hook != NULL)
     (*__malloc_initialize_hook)();