commit 504201966dbcc76b0d3c60d85e36133188620f6c
author William M. Brack <wbrack@src.gnome.org> Fri Jul 20 01:09:08 2007 +0000
committer William M. Brack <wbrack@src.gnome.org> Fri Jul 20 01:09:08 2007 +0000
tree d3e8b1f613e7fa41e668c459a61ea7d9ed5468a3
parent b0a94e8bfaaa726a1ca823989d28201ccaf6f90f

applied patch from from Patrik Fimml. Fixes bug #458268

* uri.c: applied patch from from Patrik Fimml.  Fixes bug #458268

svn path=/trunk/; revision=3645

uri.c

diff --git a/uri.c b/uri.c
index 4f5e182..34841af 100644
--- a/uri.c
+++ b/uri.c
@@ -2258,7 +2258,8 @@
 	    uptr = (xmlChar *) ref->path;
 	    if (*uptr == '/')
 		uptr++;
-	    val = xmlStrdup(uptr);
+	    /* exception characters from xmlSaveUri */
+	    val = xmlURIEscapeStr(uptr, BAD_CAST "/;&=+$,");
 	}
 	goto done;
     }
@@ -2322,7 +2323,8 @@
     
     if (nbslash == 0) {
 	if (uptr != NULL)
-	    val = xmlStrdup (uptr);
+	    /* exception characters from xmlSaveUri */
+	    val = xmlURIEscapeStr(uptr, BAD_CAST "/;&=+$,");
 	goto done;
     }
 
@@ -2362,6 +2364,12 @@
 	vptr[len - 1] = 0;
     }
 
+    /* escape the freshly-built path */
+    vptr = val;
+	/* exception characters from xmlSaveUri */
+    val = xmlURIEscapeStr(vptr, BAD_CAST "/;&=+$,");
+    xmlFree(vptr);
+
 done:
     /*
      * Free the working variables