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

xinclude: Don't use xmlHasNsProp

Browse Source 
This function can malloc and doesn't report failures.

Another design mistake is that xmlUnsetNsProp requires an xmlNs
struct.
This commit is contained in:
Nick Wellnhofer 2024-03-30 17:17:21 +01:00
parent fe3cbf897e
commit 365976dbe0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xinclude.c
View File

@ -612,7 +612,7 @@ xmlXIncludeBaseFixup(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur, xmlNodePtr copy,
const xmlChar *targetBase) { const xmlChar *targetBase) {
xmlChar *base = NULL; xmlChar *base = NULL;
xmlChar *relBase = NULL; xmlChar *relBase = NULL;
xmlAttrPtr attr; xmlNs ns;
int res; int res;
if (xmlNodeGetBaseSafe(cur->doc, cur, &base) < 0) if (xmlNodeGetBaseSafe(cur->doc, cur, &base) < 0)
@ -645,12 +645,9 @@ xmlXIncludeBaseFixup(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur, xmlNodePtr copy,
/* /*
* Delete existing xml:base if bases are equal * Delete existing xml:base if bases are equal
*/ */
attr = xmlHasNsProp(copy, BAD_CAST "base", memset(&ns, 0, sizeof(ns));
XML_XML_NAMESPACE); ns.href = XML_XML_NAMESPACE;
if (attr != NULL) { xmlUnsetNsProp(copy, &ns, BAD_CAST "base");
xmlUnlinkNode((xmlNodePtr) attr);
xmlFreeProp(attr);
}
done: done:
xmlFree(base); xmlFree(base);