From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 28 Sep 2004 18:25:52 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~17422
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a19fe332c1be896a4b834b26f8f2ed4813f180f2;p=external%2Fglibc.git

Update.

	* malloc/arena.c (ptmalloc_init): Allow MALLOC_CHECK_==0 to
	disable all checking.
---

diff --git a/ChangeLog b/ChangeLog
index 7dbec45..c030053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* malloc/arena.c (ptmalloc_init): Allow MALLOC_CHECK_==0 to
+	disable all checking.
+
 	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (si_flags): Add
 	support to get this value.
 
diff --git a/malloc/arena.c b/malloc/arena.c
index 16574e1..3adfbc4 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)();