X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_memory_functions.cpp;h=f118a86c47d0d3615c6928ba96e41268762b77c6;hb=dff88fe6ee23d740649504145c61c9d70db433e0;hp=9dec63f675512349c5f64616c961b35e51a30182;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp
index 9dec63f67..f118a86c4 100644
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -1,17 +1,29 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2011, 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2009 John Brooks <special@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd_win32wrapper.h"
+
+#include <windows.h>
 #include <exception>
 #include <new>
 #include <new.h>
@@ -28,7 +40,7 @@
 
 void * ::operator new(size_t iSize)
 {
-	void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);		/* zero memory for unix compatibility */
+	void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
 	/* This is the correct behaviour according to C++ standards for out of memory,
 	 * not returning null -- Brain
 	 */
@@ -40,11 +52,13 @@ 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! */
+void * operator new[] (size_t iSize)
+{
+	void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
 	if (!ptr)
 		throw std::bad_alloc();
 	else
@@ -53,5 +67,6 @@ void * operator new[] (size_t iSize) {
 
 void operator delete[] (void* ptr)
 {
-	HeapFree(GetProcessHeap(), 0, ptr);
+	if (ptr)
+		HeapFree(GetProcessHeap(), 0, ptr);
 }