X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_memory_functions.cpp;h=4eeadfab17ca5d4c22c7ac02c10212d3d32f4822;hb=fa67c7e80b15060773295e4719545a802d8717d5;hp=afff4287eb591cf42337f41941a6eb5c5db508d0;hpb=22f03b43c5acc3b912d2d0df894dca16a2c46a91;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp
index afff4287e..4eeadfab1 100644
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -28,7 +28,7 @@
 
 void * ::operator new(size_t iSize)
 {
-	void* ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iSize);		/* zero memory for unix compatibility */
+	void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);		/* zero memory for unix compatibility */
 	/* This is the correct behaviour according to C++ standards for out of memory,
 	 * not returning null -- Brain
 	 */
@@ -40,5 +40,20 @@ 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) {
+	void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize); /* Why were we initializing the memory to zeros here? This is just a waste of cpu! */
+	if (!ptr)
+		throw std::bad_alloc();
+	else
+		return ptr;
+}
+
+void operator delete[] (void* ptr)
+{
+	if (ptr)
+		HeapFree(GetProcessHeap(), 0, ptr);
 }