RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 04:02:41 +01:00
Code Issues Projects Releases Wiki Activity

llvm-mt: Fix memory management in WindowsManifestMergerImpl::getMergedManifest

Browse Source 
Summary:
xmlDoc needs to be released with xmlFreeDoc.
XML_PARSE_NODICT is needed for safe moving nodes between documents.
Buffer returned from xmlDocDumpFormatMemoryEnc needs xmlFree, but it needs
outlive users of getMergedManifest results.

Reviewers: ecbeckmann, rnk, zturner, ruiu

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D37321

llvm-svn: 312406
This commit is contained in:
Vitaly Buka 2017-09-02 03:15:13 +00:00
parent 9dadc942d9
commit b6b8182be1
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/WindowsManifest/WindowsManifestMerger.cpp
View File

@ -44,6 +44,14 @@ private:
#if LLVM_LIBXML2_ENABLED
xmlDocPtr CombinedDoc = nullptr;
std::vector<xmlDocPtr> MergedDocs;
bool Merged = false;
struct XmlDeleter {
void operator()(xmlChar *Ptr) { xmlFree(Ptr); }
void operator()(xmlDoc *Ptr) { xmlFreeDoc(Ptr); }
};
int BufferSize = 0;
std::unique_ptr<xmlChar, XmlDeleter> Buffer;
#endif
bool ParseErrorOccurred = false;
};
@ -613,14 +621,17 @@ WindowsManifestMerger::WindowsManifestMergerImpl::~WindowsManifestMergerImpl() {
Error WindowsManifestMerger::WindowsManifestMergerImpl::merge(
const MemoryBuffer &Manifest) {
if (Merged)
return make_error<WindowsManifestError>(
"merge after getMergedManifest is not supported");
if (Manifest.getBufferSize() == 0)
return make_error<WindowsManifestError>(
"attempted to merge empty manifest");
xmlSetGenericErrorFunc((void *)this,
WindowsManifestMergerImpl::errorCallback);
xmlDocPtr ManifestXML =
xmlReadMemory(Manifest.getBufferStart(), Manifest.getBufferSize(),
"manifest.xml", nullptr, XML_PARSE_NOBLANKS);
xmlDocPtr ManifestXML = xmlReadMemory(
Manifest.getBufferStart(), Manifest.getBufferSize(), "manifest.xml",
nullptr, XML_PARSE_NOBLANKS | XML_PARSE_NODICT);
xmlSetGenericErrorFunc(nullptr, nullptr);
if (auto E = getParseError())
return E;
@ -646,22 +657,29 @@ Error WindowsManifestMerger::WindowsManifestMergerImpl::merge(
std::unique_ptr<MemoryBuffer>
WindowsManifestMerger::WindowsManifestMergerImpl::getMergedManifest() {
unsigned char *XmlBuff;
int BufferSize = 0;
if (CombinedDoc) {
if (!Merged) {
Merged = true;
if (!CombinedDoc)
return nullptr;
xmlNodePtr CombinedRoot = xmlDocGetRootElement(CombinedDoc);
std::vector<xmlNsPtr> RequiredPrefixes;
checkAndStripPrefixes(CombinedRoot, RequiredPrefixes);
std::unique_ptr<xmlDoc> OutputDoc(xmlNewDoc((const unsigned char *)"1.0"));
std::unique_ptr<xmlDoc, XmlDeleter> OutputDoc(
xmlNewDoc((const unsigned char *)"1.0"));
xmlDocSetRootElement(OutputDoc.get(), CombinedRoot);
assert(0 == xmlDocGetRootElement(CombinedDoc));
xmlKeepBlanksDefault(0);
xmlDocDumpFormatMemoryEnc(OutputDoc.get(), &XmlBuff, &BufferSize, "UTF-8",
1);
xmlChar *Buff = nullptr;
xmlDocDumpFormatMemoryEnc(OutputDoc.get(), &Buff, &BufferSize, "UTF-8", 1);
Buffer.reset(Buff);
}
if (BufferSize == 0)
return nullptr;
return MemoryBuffer::getMemBuffer(
StringRef(FROM_XML_CHAR(XmlBuff), (size_t)BufferSize));
return BufferSize ? MemoryBuffer::getMemBuffer(StringRef(
FROM_XML_CHAR(Buffer.get()), (size_t)BufferSize))
: nullptr;
}
#else