From ac647c4699103a57b222ea6685c784a0445c0790 Mon Sep 17 00:00:00 2001
From: espie <>
Date: Tue, 14 Feb 2006 11:14:11 +0000
Subject: quick path for free(0) `looks to be safe' millert, okay tedu.

---
 src/lib/libc/stdlib/malloc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index a3babab20a..e1e1831a94 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.79 2005/10/10 12:00:52 espie Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.80 2006/02/14 11:14:11 espie Exp $	*/
 
 /*
  * ----------------------------------------------------------------------------
@@ -1685,10 +1685,6 @@ ifree(void *ptr)
 	u_long		pidx, index;
 	struct pdinfo	*pi;
 
-	/* This is legal */
-	if (ptr == NULL)
-		return;
-
 	if (!malloc_started) {
 		wrtwarning("malloc() has never been called");
 		return;
@@ -1782,6 +1778,10 @@ malloc(size_t size)
 void
 free(void *ptr)
 {
+	/* This is legal. XXX quick path */
+	if (ptr == NULL)
+		return;
+
 	_MALLOC_LOCK();
 	malloc_func = " in free():";
 	if (malloc_active++) {
-- 
cgit v1.2.3-55-g6feb