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

Unlink nodes instead of copying, to avoid memory problems.

Browse Source 
llvm-svn: 309151
This commit is contained in:
Eric Beckmann 2017-07-26 18:33:21 +00:00
parent fc07484cd4
commit 93561cd605
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/WindowsManifest/WindowsManifestMerger.cpp
View File

@ -93,21 +93,18 @@ Error mergeAttributes(XMLNodeImpl OriginalNode, XMLNodeImpl AdditionalNode) {
Error treeMerge(XMLNodeImpl OriginalRoot, XMLNodeImpl AdditionalRoot) {
#if LLVM_LIBXML2_ENABLED
XMLNodeImpl AdditionalFirstChild = AdditionalRoot->children;
xmlNode StoreNext;
for (XMLNodeImpl Child = AdditionalFirstChild; Child; Child = Child->next) {
XMLNodeImpl OriginalChildWithName;
if (!isMergeableElement(Child->name) ||
!(OriginalChildWithName =
getChildWithName(OriginalRoot, Child->name))) {
XMLNodeImpl NewChild = xmlCopyNode(Child, 1);
if (!NewChild)
return make_error<WindowsManifestError>(Twine("error when copying ") +
FROM_XML_CHAR(Child->name));
if (NewChild->ns)
xmlFreeNs(NewChild->ns); // xmlCopyNode explicitly defines default
// namespace, undo this here.
if (!xmlAddChild(OriginalRoot, NewChild))
StoreNext.next = Child->next;
xmlUnlinkNode(Child);
if (!xmlAddChild(OriginalRoot, Child))
return make_error<WindowsManifestError>(Twine("could not merge ") +
FROM_XML_CHAR(NewChild->name));
FROM_XML_CHAR(Child->name));
Child = &StoreNext;
} else if (auto E = treeMerge(OriginalChildWithName, Child)) {
return E;
}
@ -167,11 +164,7 @@ Error WindowsManifestMerger::merge(const MemoryBuffer &Manifest) {
return E;
}
} else {
XMLNodeImpl NewChild = xmlCopyNode(AdditionalRoot, 1);
if (!NewChild)
return make_error<WindowsManifestError>("could not copy manifest");
if (!xmlAddChild(CombinedRoot, NewChild))
return make_error<WindowsManifestError>("could not append manifest");
return make_error<WindowsManifestError>("multiple root nodes");
}
}
MergedDocs.push_back(ManifestXML);