shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-12-25 23:21:26 +03:00
Code

malloc-fail: Stop using xmlSplitQName2

Browse Source 
This function doesn't report malloc failures.
This commit is contained in:
Nick Wellnhofer 2024-03-05 16:45:44 +01:00
parent b38f8eae07
commit 9033a27068
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
valid.c
View File

@ -2951,19 +2951,23 @@ xmlElementPtr
xmlGetDtdElementDesc(xmlDtdPtr dtd, const xmlChar *name) {
xmlElementTablePtr table;
xmlElementPtr cur;
xmlChar *uqname = NULL, *prefix = NULL;
const xmlChar *localname;
xmlChar *prefix;
if ((dtd == NULL) || (dtd->elements == NULL) ||
(name == NULL))
return(NULL);
if ((dtd == NULL) || (name == NULL)) return(NULL);
if (dtd->elements == NULL)
return(NULL);
table = (xmlElementTablePtr) dtd->elements;
if (table == NULL)
return(NULL);
uqname = xmlSplitQName2(name, &prefix);
if (uqname != NULL)
name = uqname;
cur = xmlHashLookup2(table, name, prefix);
if (prefix != NULL) xmlFree(prefix);
if (uqname != NULL) xmlFree(uqname);
localname = xmlSplitQName4(name, &prefix);
if (localname == NULL)
return(NULL);
cur = xmlHashLookup2(table, localname, prefix);
if (prefix != NULL)
xmlFree(prefix);
return(cur);
}
@ -3077,23 +3081,23 @@ xmlAttributePtr
xmlGetDtdAttrDesc(xmlDtdPtr dtd, const xmlChar *elem, const xmlChar *name) {
xmlAttributeTablePtr table;
xmlAttributePtr cur;
xmlChar *uqname = NULL, *prefix = NULL;
const xmlChar *localname;
xmlChar *prefix = NULL;
if (dtd == NULL) return(NULL);
if (dtd->attributes == NULL) return(NULL);
if ((dtd == NULL) || (dtd->attributes == NULL) ||
(elem == NULL) || (name == NULL))
return(NULL);
table = (xmlAttributeTablePtr) dtd->attributes;
if (table == NULL)
return(NULL);
uqname = xmlSplitQName2(name, &prefix);
if (uqname != NULL) {
cur = xmlHashLookup3(table, uqname, prefix, elem);
if (prefix != NULL) xmlFree(prefix);
if (uqname != NULL) xmlFree(uqname);
} else
cur = xmlHashLookup3(table, name, NULL, elem);
localname = xmlSplitQName4(name, &prefix);
if (localname == NULL)
return(NULL);
cur = xmlHashLookup3(table, localname, prefix, elem);
if (prefix != NULL)
xmlFree(prefix);
return(cur);
}