lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

XPath fixes and cleanup, 2 general bug fixes:

Browse Source 
- xpath.[ch] : fixed some serious XPath Predicate evaluation
  problems
- Makefile.am : added XPath regression tests to normal tests
- uri.c: fixed a problem with local paths, cleanup
- parser.c: fixed a problem with large CData sections
Daniel
This commit is contained in:
Daniel Veillard
2000-10-01 15:53:30 +00:00
parent d2ade932d7
commit f09e7e35de
7 changed files with 157 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
uri.c
View File

@ -1372,16 +1372,11 @@ xmlNormalizeURIPath(char *path) {
xmlChar *
xmlBuildURI(const xmlChar *URI, const xmlChar *base) {
xmlChar *val = NULL;
int ret, len, index, cur, out;
int ret, ret2, len, index, cur, out;
xmlURIPtr ref = NULL;
xmlURIPtr bas = NULL;
xmlURIPtr res = NULL;
if ((URI == NULL) && (base == NULL))
return(NULL);
if (URI == NULL)
return((xmlChar *) xmlMemStrdup((const char *) base));
/*
* 1) The URI reference is parsed into the potential four components and
* fragment identifier, as described in Section 4.3.
@ -1390,20 +1385,43 @@ xmlBuildURI(const xmlChar *URI, const xmlChar *base) {
* as a reference to "." rather than as a synonym for the current
* URI. Should we do that here?
*/
ref = xmlCreateURI();
if (ref == NULL)
goto done;
if (*URI) {
ret = xmlParseURIReference(ref, (const char *) URI);
if (ret != 0)
if (URI == NULL)
ret = -1;
else {
ref = xmlCreateURI();
if (ref == NULL)
goto done;
if (*URI)
ret = xmlParseURIReference(ref, (const char *) URI);
else
ret = -1;
}
bas = xmlCreateURI();
if (bas == NULL)
if (base == NULL)
ret2 = -1;
else {
bas = xmlCreateURI();
if (bas == NULL)
goto done;
ret2 = xmlParseURIReference(bas, (const char *) base);
}
if ((ret != 0) && (ret2 != 0))
goto done;
ret = xmlParseURIReference(bas, (const char *) base);
if (ret != 0)
if (ret != 0) {
/*
* the base fragment must be ignored
*/
if (bas->fragment != NULL) {
xmlFree(bas->fragment);
bas->fragment = NULL;
}
val = xmlSaveUri(bas);
goto done;
}
if (ret2 != 0) {
val = xmlSaveUri(ref);
goto done;
}
/*
* 2) If the path component is empty and the scheme, authority, and
@ -1552,7 +1570,7 @@ xmlBuildURI(const xmlChar *URI, const xmlChar *base) {
/*
* Ensure the path includes a '/'
*/
if (out == 0)
if ((out == 0) && (bas->server != NULL))
res->path[out++] = '/';
while (ref->path[index] != 0) {
res->path[out++] = ref->path[index++];