Author: borisk
Date: Wed Jun 25 02:11:47 2008
New Revision: 671479
URL: http://svn.apache.org/viewvc?rev=671479&view=rev
Log:
Check for NULL in deallocate
Modified:
xerces/c/branches/xerces-2/src/xercesc/internal/MemoryManagerImpl.cpp
xerces/c/branches/xerces-2/tests/MemHandlerTest/MemoryMonitor.cpp
Modified: xerces/c/branches/xerces-2/src/xercesc/internal/MemoryManagerImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/internal/MemoryManagerImpl.cpp?rev=671479&r1=671478&r2=671479&view=diff
==============================================================================
--- xerces/c/branches/xerces-2/src/xercesc/internal/MemoryManagerImpl.cpp
(original)
+++ xerces/c/branches/xerces-2/src/xercesc/internal/MemoryManagerImpl.cpp Wed
Jun 25 02:11:47 2008
@@ -45,7 +45,8 @@
void MemoryManagerImpl::deallocate(void* p)
{
- ::operator delete(p);
+ if (p)
+ ::operator delete(p);
}
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/branches/xerces-2/tests/MemHandlerTest/MemoryMonitor.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/tests/MemHandlerTest/MemoryMonitor.cpp?rev=671479&r1=671478&r2=671479&view=diff
==============================================================================
--- xerces/c/branches/xerces-2/tests/MemHandlerTest/MemoryMonitor.cpp (original)
+++ xerces/c/branches/xerces-2/tests/MemHandlerTest/MemoryMonitor.cpp Wed Jun
25 02:11:47 2008
@@ -69,8 +69,10 @@
// didn't allocate that memory--a segfault waiting to happen...
assert(p == 0 || fHashTable->get(p) != 0);
if (p != 0)
+ {
fHashTable->removeKey(p);
- ::operator delete(p);
+ ::operator delete(p);
+ }
}
unsigned int MemoryMonitor::getTotalMemory()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
