From 2523818db5f2c77e38b7bf51944ed9fbe321700f Mon Sep 17 00:00:00 2001
From: special <special@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sun, 19 Jul 2009 07:27:30 +0000
Subject: Use correct behavior (as per C++) for 'delete NULL' on windows; found
 by Adam and CyberBotX

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11443 e03df62e-2008-0410-955e-edbf42e46eb7
---
 win/inspircd_memory_functions.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'win')

diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp
index 9dec63f67..4eeadfab1 100644
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -40,7 +40,8 @@ void * ::operator new(size_t iSize)
 
 void ::operator delete(void * ptr)
 {
-	HeapFree(GetProcessHeap(), 0, ptr);
+	if (ptr)
+		HeapFree(GetProcessHeap(), 0, ptr);
 }
 
 void * operator new[] (size_t iSize) {
@@ -53,5 +54,6 @@ void * operator new[] (size_t iSize) {
 
 void operator delete[] (void* ptr)
 {
-	HeapFree(GetProcessHeap(), 0, ptr);
+	if (ptr)
+		HeapFree(GetProcessHeap(), 0, ptr);
 }
-- 
cgit v1.2.3