gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 08:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Record detached document of a node and use that to fix memory leak.

Browse source
This commit is contained in:
rfm 2024-12-19 10:26:19 +00:00
parent 3f27cb0d23
commit 0d010003f9
3 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/NSXMLNode.m
View file

@ -506,8 +506,8 @@ isEqualTree(xmlNodePtr nodeA, xmlNodePtr nodeB)
xmlNodePtr theNode = internal->node.node;
xmlNodePtr children;
if ((theNode->type == XML_NAMESPACE_DECL) ||
(theNode->type == XML_ATTRIBUTE_NODE))
if ((theNode->type == XML_NAMESPACE_DECL)
|| (theNode->type == XML_ATTRIBUTE_NODE))
{
return NULL;
}
@ -629,6 +629,10 @@ isEqualTree(xmlNodePtr nodeA, xmlNodePtr nodeB)
#else
xmlSetTreeDoc(childNode, parentNode->doc);
#endif
if (tmp == child->detached)
{
child->detached = 0;
}
xmlFreeDoc(tmp);
}
}
@ -1292,18 +1296,21 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
{
if (theNode->doc)
{
if (theNode->doc == detached)
{
return; // Already detached.
}
/* Create a private document and move the node over.
* This is needed so that the strings of the nodes subtree
* get stored in the dictionary of this new document.
*/
// FIXME: Should flag this doc so it wont get returned in
// the method rootDocument
xmlDocPtr tmp = xmlNewDoc((xmlChar *)"1.0");
detached = xmlNewDoc((xmlChar *)"1.0");
#if LIBXML_VERSION >= 20620
xmlDOMWrapAdoptNode(NULL, theNode->doc, theNode, tmp, NULL, 0);
xmlDOMWrapAdoptNode(NULL, theNode->doc, theNode, detached,
NULL, 0);
#else
xmlSetTreeDoc(theNode, tmp);
xmlSetTreeDoc(theNode, detached);
#endif
}
else
@ -1734,6 +1741,10 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
// but we don't want to return this.
return nil;
}
if (theNode->doc == detached)
{
return nil; // the document is private from when we detached
}
return
(NSXMLDocument *)[NSXMLNode _objectForNode: (xmlNodePtr)(theNode->doc)];