mirror of
https://github.com/anope/anope.git
synced 2026-07-09 08:43:14 +02:00
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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
Reference in New Issue
Block a user