mirror/libxml2
2
0
Fork 0
mirror of https://github.com/GNOME/libxml2.git synced 2025-03-31 19:10:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug , the algorithm used for document order computation was

Browse Source 
* xpath.c: fix bug , the algorithm used for document order
  computation was failing on attributes.
Daniel
This commit is contained in:
Daniel Veillard 2003-03-07 14:20:40 +00:00
parent 8339128106
commit edfd588e95
2 changed files with 21 additions and 2 deletions

5
ChangeLog

@ -1,3 +1,8 @@
Fri Mar 7 15:18:32 CET 2003 Daniel Veillard <daniel@veillard.com>
* xpath.c: fix bug #107804, the algorithm used for document order
computation was failing on attributes.
Thu Mar 6 22:35:50 CET 2003 Daniel Veillard <daniel@veillard.com>
* valid.c: fix bug #107764 , possibility of buffer overflow

18
xpath.c

@ -1352,6 +1352,7 @@ xmlXPatherror(xmlXPathParserContextPtr ctxt, const char *file ATTRIBUTE_UNUSED,
int
xmlXPathCmpNodes(xmlNodePtr node1, xmlNodePtr node2) {
int depth1, depth2;
int attr1 = 0, attr2 = 0;
xmlNodePtr cur, root;
if ((node1 == NULL) || (node2 == NULL))
@ -1359,8 +1360,21 @@ xmlXPathCmpNodes(xmlNodePtr node1, xmlNodePtr node2) {
/*
* a couple of optimizations which will avoid computations in most cases
*/
if (node1 == node2)
return(0);
if (node1->type == XML_ATTRIBUTE_NODE) {
attr1 = 1;
node1 = node1->parent;
}
if (node2->type == XML_ATTRIBUTE_NODE) {
attr2 = 1;
node2 = node2->parent;
}
if (node1 == node2) {
if (attr1 == attr2)
return(0);
if (attr2 == 1)
return(1);
return(-1);
}
if ((node1->type == XML_NAMESPACE_DECL) ||
(node2->type == XML_NAMESPACE_DECL))
return(1);