Skip to content

Fix new delete mismatch. #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix new delete mismatch. #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions lib/xerces/src/xercesc/internal/MemoryManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
#include <xercesc/internal/MemoryManagerImpl.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>

#include <cstdint>
#include <new>

XERCES_CPP_NAMESPACE_BEGIN

MemoryManager* MemoryManagerImpl::getExceptionMemoryManager()
Expand All @@ -35,22 +38,15 @@ MemoryManager* MemoryManagerImpl::getExceptionMemoryManager()

void* MemoryManagerImpl::allocate(XMLSize_t size)
{
void* memptr;
try {
memptr = ::operator new(size);
}
catch(...) {
throw OutOfMemoryException();
}
void* memptr = new(std::nothrow) uint8_t[size];
if(memptr==NULL && size!=0)
throw OutOfMemoryException();
return memptr;
}

void MemoryManagerImpl::deallocate(void* p)
{
if (p)
::operator delete(p);
delete[] static_cast<uint8_t*>(p);
}

XERCES_CPP_NAMESPACE_END
6 changes: 4 additions & 2 deletions lib/xerces/src/xercesc/util/Base64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include <xercesc/internal/XMLReader.hpp>
#include <xercesc/framework/MemoryManager.hpp>

#include <cstddef>

XERCES_CPP_NAMESPACE_BEGIN

// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -97,7 +99,7 @@ static void* getExternalMemory( MemoryManager* const allocator
, XMLSize_t const sizeToAllocate)
{
return allocator ? allocator->allocate(sizeToAllocate)
: ::operator new(sizeToAllocate);
: new uint8_t[sizeToAllocate];
}

/***
Expand All @@ -107,7 +109,7 @@ static void returnExternalMemory( MemoryManager* const allocator
, void* buffer)
{
allocator ? allocator->deallocate(buffer)
: ::operator delete(buffer);
: delete[] static_cast<uint8_t*>(buffer);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/xerces/tests/src/MemHandlerTest/MemoryMonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ MemoryManager* MemoryMonitor::getExceptionMemoryManager()

void* MemoryMonitor::allocate(XMLSize_t size)
{
void *key = ::operator new(size);
void *key = new uint8_t[size];
fHashTable->put(key, (unsigned int)size);
return key;
}
Expand All @@ -56,7 +56,7 @@ void MemoryMonitor::deallocate(void* p)
if (p != 0)
{
fHashTable->removeKey(p);
::operator delete(p);
delete[] static_cast<uint8_t*>(p);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/msix/PAL/XML/xerces-c/XmlObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ class XercesXMLBytePtr
}

void InternalRelease()
{ delete(m_ptr);
{ delete[] m_ptr;
m_ptr = nullptr;
}

Expand Down Expand Up @@ -665,4 +665,4 @@ class XercesFactory final : public ComClass<XercesFactory, IXmlFactory>

ComPtr<IXmlFactory> CreateXmlFactory(IMsixFactory* factory) { return ComPtr<IXmlFactory>::Make<XercesFactory>(factory); }

} // namespace MSIX
} // namespace MSIX