Author: scantor
Date: Sat Feb 28 00:52:04 2015
New Revision: 1662868
URL: http://svn.apache.org/r1662868
Log:
XERCESC-1979
Modified:
xerces/c/branches/xerces-3.1/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
xerces/c/branches/xerces-3.1/src/xercesc/internal/MemoryManagerImpl.cpp
Modified:
xerces/c/branches/xerces-3.1/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/branches/xerces-3.1/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp?rev=1662868&r1=1662867&r2=1662868&view=diff
==============================================================================
--- xerces/c/branches/xerces-3.1/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
(original)
+++ xerces/c/branches/xerces-3.1/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
Sat Feb 28 00:52:04 2015
@@ -280,7 +280,7 @@ DOMLSSerializerImpl::DOMLSSerializerImpl
,fNamespaceStack(0)
,fMemoryManager(manager)
{
- fNamespaceStack=new (fMemoryManager) RefVectorOf< RefHashTableOf<XMLCh>
>(0,true, fMemoryManager);
+ fNamespaceStack=new (fMemoryManager) RefVectorOf< RefHashTableOf<XMLCh>
>(1, true, fMemoryManager);
//
// set features to default setting
Modified:
xerces/c/branches/xerces-3.1/src/xercesc/internal/MemoryManagerImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/branches/xerces-3.1/src/xercesc/internal/MemoryManagerImpl.cpp?rev=1662868&r1=1662867&r2=1662868&view=diff
==============================================================================
--- xerces/c/branches/xerces-3.1/src/xercesc/internal/MemoryManagerImpl.cpp
(original)
+++ xerces/c/branches/xerces-3.1/src/xercesc/internal/MemoryManagerImpl.cpp Sat
Feb 28 00:52:04 2015
@@ -30,7 +30,7 @@ XERCES_CPP_NAMESPACE_BEGIN
MemoryManager* MemoryManagerImpl::getExceptionMemoryManager()
{
- return this;
+ return this;
}
void* MemoryManagerImpl::allocate(XMLSize_t size)
@@ -42,10 +42,10 @@ void* MemoryManagerImpl::allocate(XMLSiz
catch(...) {
throw OutOfMemoryException();
}
- if (memptr != NULL) {
- return memptr;
- }
- throw OutOfMemoryException();
+
+ if(memptr==NULL && size!=0)
+ throw OutOfMemoryException();
+ return memptr;
}
void MemoryManagerImpl::deallocate(void* p)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
