From f081b88dfbce94c3c7c8faf0b0f91b117fbdfcc6 Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Tue, 28 Feb 2012 20:24:05 -0800
Subject: [PATCH] Fix realloc(p, 0) to act like free(p).

Reported by Yoni Londer.
---
 src/jemalloc.c | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/jemalloc.c b/src/jemalloc.c
index 08e5f31c..865c6236 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -1124,23 +1124,28 @@ JEMALLOC_P(realloc)(void *ptr, size_t size)
 	    ;
 
 	if (size == 0) {
-		if (config_sysv == false || opt_sysv == false)
-			size = 1;
-		else {
-			if (ptr != NULL) {
-				if (config_prof || config_stats)
-					old_size = isalloc(ptr);
-				if (config_prof && opt_prof) {
-					old_ctx = prof_ctx_get(ptr);
-					cnt = NULL;
-				}
-				idalloc(ptr);
-			} else if (config_prof && opt_prof) {
-				old_ctx = NULL;
+		if (ptr != NULL) {
+			/* realloc(ptr, 0) is equivalent to free(p). */
+			if (config_prof || config_stats)
+				old_size = isalloc(ptr);
+			if (config_prof && opt_prof) {
+				old_ctx = prof_ctx_get(ptr);
 				cnt = NULL;
 			}
+			idalloc(ptr);
 			ret = NULL;
 			goto RETURN;
+		} else {
+			if (config_sysv == false || opt_sysv == false)
+				size = 1;
+			else {
+				if (config_prof && opt_prof) {
+					old_ctx = NULL;
+					cnt = NULL;
+				}
+				ret = NULL;
+				goto RETURN;
+			}
 		}
 	}
 
@@ -1188,6 +1193,7 @@ OOM:
 			errno = ENOMEM;
 		}
 	} else {
+		/* realloc(NULL, size) is equivalent to malloc(size). */
 		if (config_prof && opt_prof)
 			old_ctx = NULL;
 		if (malloc_init()) {