fly/flightgear
1
0
Fork 0
Code Activity

Fix an off by one problem.

Browse source
This commit is contained in:
ehofman 2009-04-30 13:56:50 +00:00 • committed by Tim Moore
parent efc8d18d06
commit bcf9687606
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
utils/xmlgrep/ChangeLog
View file

@ -1,3 +1,6 @@
30-04-2009
* Fix an off by one problem.
28-04-2009
* changes to the code to allow walking the xml-tree using "*" as a node name
* add printxml, an example utility that walks an xml-tree and prints it

15
utils/xmlgrep/xml.c
View file

@ -1564,11 +1564,10 @@ __xmlNodeGet(const char *start, size_t *len, char **name, size_t *rlen, size_t *
restlen -= new-cur;
cur = new;
}
if (*cur != '/') /* cascading tag found */
{
char *node = "*";
size_t slen = restlen+1;
size_t slen = restlen+1; /* due to cur-1 below*/
size_t nlen = 1;
size_t pos = -1;
@ -1593,15 +1592,17 @@ __xmlNodeGet(const char *start, size_t *len, char **name, size_t *rlen, size_t *
*len = XML_UNEXPECTED_EOF;
return 0;
}
else new = cur + slen;
}
restlen -= slen;
cur = new;
slen--;
new = cur + slen;
restlen -= slen;
}
else restlen -= slen;
/*
* look for the closing tag of the cascading block
*/
cur = new;
new = memchr(cur, '<', restlen);
if (!new)
{
@ -1664,7 +1665,7 @@ __xmlNodeGet(const char *start, size_t *len, char **name, size_t *rlen, size_t *
*len = XML_ELEMENT_NO_CLOSING_TAG;
return 0;
}
}
} /* while */
if (found == 0)
{