diff options
author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-17 20:17:30 +0000 |
---|---|---|
committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-17 20:17:30 +0000 |
commit | c4a8cc7e2f3890b8d82051c89748bea80350e8d4 (patch) | |
tree | a08d706405cf90d1b319885e56a07285315e70c7 /src/win32_memory.cpp | |
parent | 88701c226e2e13cd9e339eab46e65dced75497b2 (diff) |
Fixed issue with the MSVC++ build of Anope crashing on a DLL throwing an exception, thanks to w00t for pointing out the overloaded new/delete operators from InspIRCd.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1838 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/win32_memory.cpp')
-rw-r--r-- | src/win32_memory.cpp | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/src/win32_memory.cpp b/src/win32_memory.cpp new file mode 100644 index 000000000..a83677eb2 --- /dev/null +++ b/src/win32_memory.cpp @@ -0,0 +1,57 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + +#include <windows.h> +#include <exception> +#include <new> +#include <new.h> + +/** On windows, all dll files and executables have their own private heap, + * whereas on POSIX systems, shared objects loaded into an executable share + * the executable's heap. This means that if we pass an arbitrary pointer to + * a windows DLL which is not allocated in that dll, without some form of + * marshalling, we get a page fault. To fix this, these overrided operators + * new and delete use the windows HeapAlloc and HeapFree functions to claim + * memory from the windows global heap. This makes windows 'act like' POSIX + * when it comes to memory usage between dlls and exes. + */ + +void * ::operator new(size_t iSize) +{ + 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 + */ + if (!ptr) + throw std::bad_alloc(); + else + return ptr; +} + +void ::operator delete(void *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) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} |