lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-30 10:45:36 +03:00
Code Activity

applied patch from from Patrik Fimml. Fixes bug #458268

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

svn path=/trunk/; revision=3645
This commit is contained in:
William M. Brack
2007-07-20 01:09:08 +00:00
parent b0a94e8bfa
commit 504201966d
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
Thu Jul 19 18:10:58 PDT 2007 William Brack <wbrack@mmm.com.hk>
* uri.c: applied patch from from Patrik Fimml. Fixes bug #458268.
Wed Jul 18 11:05:08 PDT 2007 William Brack <wbrack@mmm.com.hk> Wed Jul 18 11:05:08 PDT 2007 William Brack <wbrack@mmm.com.hk>
* xinclude.c: applied patch from bug #454608 from Patrik Fimml. * xinclude.c: applied patch from bug #454608 from Patrik Fimml.

12
uri.c
View File

@@ -2258,7 +2258,8 @@ xmlBuildRelativeURI (const xmlChar * URI, const xmlChar * base)
uptr = (xmlChar *) ref->path; uptr = (xmlChar *) ref->path;
if (*uptr == '/') if (*uptr == '/')
uptr++; uptr++;
val = xmlStrdup(uptr); /* exception characters from xmlSaveUri */
val = xmlURIEscapeStr(uptr, BAD_CAST "/;&=+$,");
} }
goto done; goto done;
} }
@@ -2322,7 +2323,8 @@ xmlBuildRelativeURI (const xmlChar * URI, const xmlChar * base)
if (nbslash == 0) { if (nbslash == 0) {
if (uptr != NULL) if (uptr != NULL)
val = xmlStrdup (uptr); /* exception characters from xmlSaveUri */
val = xmlURIEscapeStr(uptr, BAD_CAST "/;&=+$,");
goto done; goto done;
} }
@@ -2362,6 +2364,12 @@ xmlBuildRelativeURI (const xmlChar * URI, const xmlChar * base)
vptr[len - 1] = 0; vptr[len - 1] = 0;
} }
/* escape the freshly-built path */
vptr = val;
/* exception characters from xmlSaveUri */
val = xmlURIEscapeStr(vptr, BAD_CAST "/;&=+$,");
xmlFree(vptr);
done: done:
/* /*
* Free the working variables * Free the working variables