svn commit: r671478 - in /xerces/c/trunk: src/xercesc/internal/MemoryManagerImpl.cpp tests/src/MemHandlerTest/MemoryMonitor.cpp

[borisk]

Author: borisk
Date: Wed Jun 25 02:11:19 2008
New Revision: 671478

URL: http://svn.apache.org/viewvc?rev=671478&view=rev
Log:
Check for NULL in deallocate

Modified:
    xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.cpp
    xerces/c/trunk/tests/src/MemHandlerTest/MemoryMonitor.cpp

Modified: xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.cpp?rev=671478&r1=671477&r2=671478&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.cpp Wed Jun 25 
02:11:19 2008
@@ -50,7 +50,8 @@
 
 void MemoryManagerImpl::deallocate(void* p)
 {
-    ::operator delete(p);
+    if (p)
+        ::operator delete(p);
 }
 
 XERCES_CPP_NAMESPACE_END

Modified: xerces/c/trunk/tests/src/MemHandlerTest/MemoryMonitor.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/MemHandlerTest/MemoryMonitor.cpp?rev=671478&r1=671477&r2=671478&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/MemHandlerTest/MemoryMonitor.cpp (original)
+++ xerces/c/trunk/tests/src/MemHandlerTest/MemoryMonitor.cpp Wed Jun 25 
02:11:19 2008
@@ -54,8 +54,10 @@
     // didn't allocate that memory--a segfault waiting to happen...
     assert(p == 0 || fHashTable->containsKey(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]