gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSXMLElement.m,

Browse source 
* Source/NSXMLNode.m: Fix memory leak for attribute private
documents found by valgrind.
* Tests/base/NSXMLNode/namespace.m: Use drain instead of
release.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34976 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2012-03-22 17:33:09 +00:00
parent e1f3c34218
commit 07cd15dd72
4 changed files with 101 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-03-22 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLElement.m,
* Source/NSXMLNode.m: Fix memory leak for attribute private
documents found by valgrind.
* Tests/base/NSXMLNode/namespace.m: Use drain instead of release.
2012-03-22 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLDocument.m (-URI, -setURI:): Specific implementation.

93
Source/NSXMLElement.m
View file

@ -33,43 +33,8 @@
#import "GSInternal.h"
GS_PRIVATE_INTERNAL(NSXMLElement)
void
cleanup_namespaces(xmlNodePtr node, xmlNsPtr ns)
{
if ((node == NULL) || (ns == NULL))
return;
if ((node->type == XML_ATTRIBUTE_NODE) ||
(node->type == XML_ELEMENT_NODE))
{
xmlNsPtr ns1 = node->ns;
if (ns1 == ns)
{
return;
}
// Either both the same or one NULL and the other the same
if (ns1 != NULL &&
(((ns1->href == NULL) &&
(xmlStrcmp(ns1->prefix, ns->prefix) == 0)) ||
((ns1->prefix == NULL) &&
(xmlStrcmp(ns1->href, ns->href) == 0)) ||
((xmlStrcmp(ns1->prefix, ns->prefix) == 0) &&
(xmlStrcmp(ns1->href, ns->href) == 0))))
{
//xmlFreeNs(ns1);
xmlSetNs(node, ns);
}
cleanup_namespaces(node->children, ns);
cleanup_namespaces(node->next, ns);
if (node->type == XML_ELEMENT_NODE)
{
cleanup_namespaces((xmlNodePtr)node->properties, ns);
}
}
}
extern void cleanup_namespaces(xmlNodePtr node, xmlNsPtr ns);
extern void ensure_oldNs(xmlNodePtr node);
@implementation NSXMLElement
@ -239,7 +204,7 @@ cleanup_namespaces(xmlNodePtr node, xmlNsPtr ns)
}
if ((cur->ns == childNS) ||
((cur->ns == NULL) && (xmlStrcmp(childNS->prefix, "") == 0)))
((cur->ns == NULL) && (xmlStrcmp(childNS->prefix, (const xmlChar*)"") == 0)))
{
if (xmlStrcmp(xmlName, cur->name) == 0)
{
@ -268,6 +233,8 @@ cleanup_namespaces(xmlNodePtr node, xmlNsPtr ns)
if (attr->ns != NULL)
{
xmlNsPtr ns = attr->ns;
xmlDocPtr tmp = attr->doc;
BOOL resolved = NO;
if (ns->href == NULL)
{
@ -277,6 +244,7 @@ cleanup_namespaces(xmlNodePtr node, xmlNsPtr ns)
{
ns = newNs;
attr->ns = ns;
resolved = YES;
}
}
else //if (ns->prefix == NULL)
@ -287,9 +255,58 @@ cleanup_namespaces(xmlNodePtr node, xmlNsPtr ns)
{
ns = newNs;
attr->ns = ns;
resolved = YES;
}
}
if (!resolved && (tmp != NULL))
{
xmlNsPtr cur = tmp->oldNs;
xmlNsPtr last = NULL;
xmlNsPtr oldNs1;
// Need to transfer the namespace to the new tree
// Unlink in old
while (cur)
{
if (cur == ns)
{
if (last == NULL)
{
tmp->oldNs = NULL;
}
else
{
last->next = ns->next;
}
cur->next = NULL;
break;
}
cur = cur->next;
}
// Insert in new
ensure_oldNs(node);
oldNs1 = node->doc->oldNs;
while (oldNs1)
{
if (oldNs1->next == NULL)
{
oldNs1->next = cur;
break;
}
oldNs1 = oldNs1->next;
}
}
#if LIBXML_VERSION >= 20620
xmlDOMWrapAdoptNode(NULL, attr->doc, (xmlNodePtr)attr,
node->doc, node, 0);
#else
xmlSetTreeDoc((xmlNodePtr)aattr, node->doc);
#endif
xmlFreeDoc(tmp);
oldAttr = xmlHasNsProp(node, attr->name, ns->href);
}
else

41
Source/NSXMLNode.m
View file

@ -33,10 +33,45 @@
#import "GSInternal.h"
GS_PRIVATE_INTERNAL(NSXMLNode)
extern void
cleanup_namespaces(xmlNodePtr node, xmlNsPtr ns);
void
cleanup_namespaces(xmlNodePtr node, xmlNsPtr ns)
{
if ((node == NULL) || (ns == NULL))
return;
static void
if ((node->type == XML_ATTRIBUTE_NODE) ||
(node->type == XML_ELEMENT_NODE))
{
xmlNsPtr ns1 = node->ns;
if (ns1 == ns)
{
return;
}
// Either both the same or one NULL and the other the same
if (ns1 != NULL &&
(((ns1->href == NULL) &&
(xmlStrcmp(ns1->prefix, ns->prefix) == 0)) ||
((ns1->prefix == NULL) &&
(xmlStrcmp(ns1->href, ns->href) == 0)) ||
((xmlStrcmp(ns1->prefix, ns->prefix) == 0) &&
(xmlStrcmp(ns1->href, ns->href) == 0))))
{
//xmlFreeNs(ns1);
xmlSetNs(node, ns);
}
cleanup_namespaces(node->children, ns);
cleanup_namespaces(node->next, ns);
if (node->type == XML_ELEMENT_NODE)
{
cleanup_namespaces((xmlNodePtr)node->properties, ns);
}
}
}
void
ensure_oldNs(xmlNodePtr node)
{
if (node->doc == NULL)

2
Tests/base/NSXMLNode/namespaces.m
View file

@ -178,7 +178,7 @@ int main()
PASS_EQUAL(actualXML, expectedXML, "unexpected xml output");
testHopeful = NO;
[arp release];
[arp drain];
arp = nil;
END_SET("NSXMLNode namespace handling")
return 0;