applied patch from Kasimier Buchcik which fixes a problem in xmlSearchNs
* tree.c: applied patch from Kasimier Buchcik which fixes a
problem in xmlSearchNs introduced in 2.6.0
Damniel
diff --git a/tree.c b/tree.c
index 5847f5c..e9d50e7 100644
--- a/tree.c
+++ b/tree.c
@@ -5292,7 +5292,9 @@
*/
xmlNsPtr
xmlSearchNs(xmlDocPtr doc, xmlNodePtr node, const xmlChar *nameSpace) {
+
xmlNsPtr cur;
+ xmlNodePtr orig = node;
if (node == NULL) return(NULL);
if ((nameSpace != NULL) &&
@@ -5350,16 +5352,18 @@
return(cur);
cur = cur->next;
}
- cur = node->ns;
- if (cur != NULL) {
- if ((cur->prefix == NULL) && (nameSpace == NULL) &&
- (cur->href != NULL))
- return(cur);
- if ((cur->prefix != NULL) && (nameSpace != NULL) &&
- (cur->href != NULL) &&
- (xmlStrEqual(cur->prefix, nameSpace)))
- return(cur);
- }
+ if (orig != node) {
+ cur = node->ns;
+ if (cur != NULL) {
+ if ((cur->prefix == NULL) && (nameSpace == NULL) &&
+ (cur->href != NULL))
+ return(cur);
+ if ((cur->prefix != NULL) && (nameSpace != NULL) &&
+ (cur->href != NULL) &&
+ (xmlStrEqual(cur->prefix, nameSpace)))
+ return(cur);
+ }
+ }
}
node = node->parent;
}
@@ -5482,14 +5486,16 @@
}
cur = cur->next;
}
- cur = node->ns;
- if (cur != NULL) {
- if ((cur->href != NULL) && (href != NULL) &&
- (xmlStrEqual(cur->href, href))) {
- if (xmlNsInScope(doc, orig, node, cur->href) == 1)
- return (cur);
+ if (orig != node) {
+ cur = node->ns;
+ if (cur != NULL) {
+ if ((cur->href != NULL) && (href != NULL) &&
+ (xmlStrEqual(cur->href, href))) {
+ if (xmlNsInScope(doc, orig, node, cur->href) == 1)
+ return (cur);
+ }
}
- }
+ }
}
node = node->parent;
}