bug fixes, bugfixes, bugfixes ...

- parser.c: Fixed Bug#21552: libxml fails to decode &
- uri.c testUri.c patches, by Marc Sanfacon (1 left)
- parser.c HTMLparser.c: HTML/encoding push problems reportedi by Wayne Davison
Daniel

1 files changed, 8 insertions, 0 deletions

diff --git a/uri.c b/uri.c
index 1ed14104..28810c7c 100644
--- a/uri.c
+++ b/uri.c
@@ -1024,6 +1024,7 @@ xmlParseURIPathSegments(xmlURIPtr uri, const char **str, int slash) {
 	    *str = cur;
 	    return(-1);
 	}
+	path[len] = '\0';
 	if (uri->path != NULL)
 	    memcpy(path, uri->path, len2);
 	if (slash) {
@@ -1614,6 +1615,13 @@ xmlBuildURI(const xmlChar *URI, const xmlChar *base) {
      */
     if (ref->path != NULL) {
 	index = 0;
+	/*
+	 * Ensure the path includes a '/'
+	 */
+	if (res->path[0] != '/' && ref->path[0] != 0 &&
+	    ref->path[index] != '/') {
+	    res->path[out++] = '/';
+	}
 	while (ref->path[index] != 0) {
 	    res->path[out++] = ref->path[index++];
 	}