From: Hugo van der Sanden <hv@crypt.org>
Date: Thu, 2 May 2002 04:22:02 +0000 (+0100)
Subject: Re: [ID 20020425.009] perlio & -Dm dumps core
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=51a5ed28a579e633464fefb93efa351ff19a6d18;p=p5sagit%2Fp5-mst-13.2.git

Re: [ID 20020425.009] perlio & -Dm dumps core
Message-Id: <200205020322.g423M2p19726@crypt.compulink.co.uk>

p4raw-id: //depot/perl@16342
---

diff --git a/malloc.c b/malloc.c
index 450b6a2..aafe41d 100644
--- a/malloc.c
+++ b/malloc.c
@@ -356,9 +356,16 @@
 
 #ifdef DEBUGGING
 #  undef DEBUG_m
-#  define DEBUG_m(a)  \
+#  define DEBUG_m(a) 							\
     STMT_START {							\
-	if (PERL_GET_INTERP) { dTHX; if (DEBUG_m_TEST) { a; } }	\
+	if (PERL_GET_INTERP) {						\
+	    dTHX;							\
+	    if (DEBUG_m_TEST) {						\
+		PL_debug &= ~DEBUG_m_FLAG;				\
+		a;							\
+		PL_debug |= DEBUG_m_FLAG;				\
+	    }								\
+	}								\
     } STMT_END
 #endif
 
@@ -1103,11 +1110,6 @@ Perl_malloc(register size_t nbytes)
   		return (NULL);
 	}
 
-	DEBUG_m(PerlIO_printf(Perl_debug_log,
-			      "0x%"UVxf": (%05lu) malloc %ld bytes\n",
-			      PTR2UV(p), (unsigned long)(PL_an++),
-			      (long)size));
-
 	/* remove from linked list */
 #if defined(RCHECK)
 	if ((PTR2UV(p)) & (MEM_ALIGNBYTES - 1)) {
@@ -1128,6 +1130,11 @@ Perl_malloc(register size_t nbytes)
 
 	MALLOC_UNLOCK;
 
+	DEBUG_m(PerlIO_printf(Perl_debug_log,
+			      "0x%"UVxf": (%05lu) malloc %ld bytes\n",
+			      PTR2UV(p), (unsigned long)(PL_an++),
+			      (long)size));
+
 #ifdef IGNORE_SMALL_BAD_FREE
 	if (bucket >= FIRST_BUCKET_WITH_CHECK)
 #endif