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

valid: Report malloc failure in legacy DTD serialization

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-03-05 19:58:17 +01:00
parent 264b283c27
commit ab345338a4
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
entities.c
View File

@ -937,7 +937,8 @@ xmlDumpEntityDecl(xmlBufferPtr buf, xmlEntityPtr ent) {
save = xmlSaveToBuffer(buf, NULL, 0);
xmlSaveTree(save, (xmlNodePtr) ent);
xmlSaveClose(save);
if (xmlSaveFinish(save) != XML_ERR_OK)
xmlFree(xmlBufferDetach(buf));
}
/**
@ -948,9 +949,9 @@ xmlDumpEntityDecl(xmlBufferPtr buf, xmlEntityPtr ent) {
* When using the hash table scan function, arguments need to be reversed
*/
static void
xmlDumpEntityDeclScan(void *ent, void *buf,
xmlDumpEntityDeclScan(void *ent, void *save,
const xmlChar *name ATTRIBUTE_UNUSED) {
xmlDumpEntityDecl((xmlBufferPtr) buf, (xmlEntityPtr) ent);
xmlSaveTree(save, ent);
}
/**
@ -962,6 +963,14 @@ xmlDumpEntityDeclScan(void *ent, void *buf,
*/
void
xmlDumpEntitiesTable(xmlBufferPtr buf, xmlEntitiesTablePtr table) {
xmlHashScan(table, xmlDumpEntityDeclScan, buf);
xmlSaveCtxtPtr save;
if ((buf == NULL) || (table == NULL))
return;
save = xmlSaveToBuffer(buf, NULL, 0);
xmlHashScan(table, xmlDumpEntityDeclScan, save);
if (xmlSaveFinish(save) != XML_ERR_OK)
xmlFree(xmlBufferDetach(buf));
}
#endif /* LIBXML_OUTPUT_ENABLED */

36
valid.c
View File

@ -1424,7 +1424,8 @@ xmlDumpElementDecl(xmlBufferPtr buf, xmlElementPtr elem) {
save = xmlSaveToBuffer(buf, NULL, 0);
xmlSaveTree(save, (xmlNodePtr) elem);
xmlSaveClose(save);
if (xmlSaveFinish(save) != XML_ERR_OK)
xmlFree(xmlBufferDetach(buf));
}
/**
@ -1436,9 +1437,9 @@ xmlDumpElementDecl(xmlBufferPtr buf, xmlElementPtr elem) {
* the arguments.
*/
static void
xmlDumpElementDeclScan(void *elem, void *buf,
xmlDumpElementDeclScan(void *elem, void *save,
const xmlChar *name ATTRIBUTE_UNUSED) {
xmlDumpElementDecl((xmlBufferPtr) buf, (xmlElementPtr) elem);
xmlSaveTree(save, elem);
}
/**
@ -1452,9 +1453,15 @@ xmlDumpElementDeclScan(void *elem, void *buf,
*/
void
xmlDumpElementTable(xmlBufferPtr buf, xmlElementTablePtr table) {
xmlSaveCtxtPtr save;
if ((buf == NULL) || (table == NULL))
return;
xmlHashScan(table, xmlDumpElementDeclScan, buf);
save = xmlSaveToBuffer(buf, NULL, 0);
xmlHashScan(table, xmlDumpElementDeclScan, save);
if (xmlSaveFinish(save) != XML_ERR_OK)
xmlFree(xmlBufferDetach(buf));
}
#endif /* LIBXML_OUTPUT_ENABLED */
@ -1966,7 +1973,8 @@ xmlDumpAttributeDecl(xmlBufferPtr buf, xmlAttributePtr attr) {
save = xmlSaveToBuffer(buf, NULL, 0);
xmlSaveTree(save, (xmlNodePtr) attr);
xmlSaveClose(save);
if (xmlSaveFinish(save) != XML_ERR_OK)
xmlFree(xmlBufferDetach(buf));
}
/**
@ -1977,9 +1985,9 @@ xmlDumpAttributeDecl(xmlBufferPtr buf, xmlAttributePtr attr) {
* This is used with the hash scan function - just reverses arguments
*/
static void
xmlDumpAttributeDeclScan(void *attr, void *buf,
xmlDumpAttributeDeclScan(void *attr, void *save,
const xmlChar *name ATTRIBUTE_UNUSED) {
xmlDumpAttributeDecl((xmlBufferPtr) buf, (xmlAttributePtr) attr);
xmlSaveTree(save, attr);
}
/**
@ -1993,9 +2001,15 @@ xmlDumpAttributeDeclScan(void *attr, void *buf,
*/
void
xmlDumpAttributeTable(xmlBufferPtr buf, xmlAttributeTablePtr table) {
xmlSaveCtxtPtr save;
if ((buf == NULL) || (table == NULL))
return;
xmlHashScan(table, xmlDumpAttributeDeclScan, buf);
save = xmlSaveToBuffer(buf, NULL, 0);
xmlHashScan(table, xmlDumpAttributeDeclScan, save);
if (xmlSaveFinish(save) != XML_ERR_OK)
xmlFree(xmlBufferDetach(buf));
}
#endif /* LIBXML_OUTPUT_ENABLED */
@ -2202,7 +2216,8 @@ xmlDumpNotationDecl(xmlBufferPtr buf, xmlNotationPtr nota) {
save = xmlSaveToBuffer(buf, NULL, 0);
xmlSaveNotationDecl(save, nota);
xmlSaveClose(save);
if (xmlSaveFinish(save) != XML_ERR_OK)
xmlFree(xmlBufferDetach(buf));
}
/**
@ -2223,7 +2238,8 @@ xmlDumpNotationTable(xmlBufferPtr buf, xmlNotationTablePtr table) {
save = xmlSaveToBuffer(buf, NULL, 0);
xmlSaveNotationTable(save, table);
xmlSaveClose(save);
if (xmlSaveFinish(save) != XML_ERR_OK)
xmlFree(xmlBufferDetach(buf));
}
#endif /* LIBXML_OUTPUT_ENABLED */