External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Deallocation of null pointer is illegal for custom allocators

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@656 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-08-29 15:20:27 +00:00
parent a33c030d60
commit ea0dbe7884
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/main.cpp
View File

@ -6,6 +6,7 @@
#include <iostream> #include <iostream>
#include <stdio.h> #include <stdio.h>
#include <float.h> #include <float.h>
#include <assert.h>
test_runner* test_runner::_tests = 0; test_runner* test_runner::_tests = 0;
size_t test_runner::_memory_fail_threshold = 0; size_t test_runner::_memory_fail_threshold = 0;
@ -32,13 +33,12 @@ static void* custom_allocate(size_t size)
static void custom_deallocate(void* ptr) static void custom_deallocate(void* ptr)
{ {
if (ptr) assert(ptr);
{
g_memory_total_size -= memory_size(ptr); g_memory_total_size -= memory_size(ptr);
g_memory_total_count--; g_memory_total_count--;
memory_deallocate(ptr); memory_deallocate(ptr);
}
} }
static void replace_memory_management() static void replace_memory_management()
@ -89,22 +89,22 @@ void* operator new[](size_t size, const std::nothrow_t&) throw()
void operator delete(void* ptr) DECL_NOTHROW() void operator delete(void* ptr) DECL_NOTHROW()
{ {
custom_deallocate(ptr); if (ptr) custom_deallocate(ptr);
} }
void operator delete[](void* ptr) DECL_NOTHROW() void operator delete[](void* ptr) DECL_NOTHROW()
{ {
custom_deallocate(ptr); if (ptr) custom_deallocate(ptr);
} }
void operator delete(void* ptr, const std::nothrow_t&) throw() void operator delete(void* ptr, const std::nothrow_t&) throw()
{ {
custom_deallocate(ptr); if (ptr) custom_deallocate(ptr);
} }
void operator delete[](void* ptr, const std::nothrow_t&) throw() void operator delete[](void* ptr, const std::nothrow_t&) throw()
{ {
custom_deallocate(ptr); if (ptr) custom_deallocate(ptr);
} }
#if defined(_MSC_VER) && _MSC_VER > 1200 && _MSC_VER < 1400 && !defined(__INTEL_COMPILER) && !defined(__DMC__) #if defined(_MSC_VER) && _MSC_VER > 1200 && _MSC_VER < 1400 && !defined(__INTEL_COMPILER) && !defined(__DMC__)