[prev in list] [next in list] [prev in thread] [next in thread]
List: xerces-cvs
Subject: svn commit: r671478 - in /xerces/c/trunk:
From: borisk () apache ! org
Date: 2008-06-25 9:11:19
Message-ID: 20080625091120.0C10123889F3 () eris ! apache ! org
[Download RAW message or body]
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: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic