c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

uri: Fix xmlBuildURI with NULL base

Browse Source 
Don't try to parse URI if base is NULL. Fixes functions like xmlParseDTD
with certain filenames.

Should fix #742.
This commit is contained in:
Nick Wellnhofer 2024-06-20 21:06:38 +02:00
parent 1dd5e76a69
commit 4c3d22b059
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
uri.c
View File

@ -2018,6 +2018,18 @@ xmlBuildURISafe(const xmlChar *URI, const xmlChar *base, xmlChar **valPtr) {
if (valPtr == NULL) if (valPtr == NULL)
return(1); return(1);
*valPtr = NULL;
if (URI == NULL)
return(1);
if (base == NULL) {
val = xmlStrdup(URI);
if (val == NULL)
return(-1);
*valPtr = val;
return(0);
}
/* /*
* 1) The URI reference is parsed into the potential four components and * 1) The URI reference is parsed into the potential four components and
@ -2027,9 +2039,7 @@ xmlBuildURISafe(const xmlChar *URI, const xmlChar *base, xmlChar **valPtr) {
* as a reference to "." rather than as a synonym for the current * as a reference to "." rather than as a synonym for the current
* URI. Should we do that here? * URI. Should we do that here?
*/ */
if (URI == NULL) if (URI[0] != 0)
ret = 1;
else if (URI[0] != 0)
ret = xmlParseURISafe((const char *) URI, &ref); ret = xmlParseURISafe((const char *) URI, &ref);
else else
ret = 0; ret = 0;