lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00
Code Activity

tree: Don't abort early if malloc fails in DOM functions

Browse Source 
If malloc fails halfway through updating a subtree, we must process the
rest of the tree to avoid tree corruption.
This commit is contained in:
Nick Wellnhofer
2024-03-12 22:30:43 +01:00
parent ad019ba102
commit 4a90ce089c
1 changed files with 37 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
tree.c
View File

@@ -7913,7 +7913,7 @@ xmlDOMWrapRemoveNode(xmlDOMWrapCtxtPtr ctxt, xmlDocPtr doc,
xmlNodePtr node, int options ATTRIBUTE_UNUSED) xmlNodePtr node, int options ATTRIBUTE_UNUSED)
{ {
xmlNsPtr *list = NULL; xmlNsPtr *list = NULL;
int sizeList = 0, nbList = 0, i, j; int sizeList = 0, nbList = 0, ret = 0, i, j;
xmlNsPtr ns; xmlNsPtr ns;
if ((node == NULL) || (doc == NULL) || (node->doc != doc)) if ((node == NULL) || (doc == NULL) || (node->doc != doc))
@@ -7949,7 +7949,7 @@ xmlDOMWrapRemoveNode(xmlDOMWrapCtxtPtr ctxt, xmlDocPtr doc,
do { do {
if (xmlDOMWrapNSNormAddNsMapItem2(&list, &sizeList, if (xmlDOMWrapNSNormAddNsMapItem2(&list, &sizeList,
&nbList, ns, ns) == -1) &nbList, ns, ns) == -1)
goto internal_error; ret = -1;
ns = ns->next; ns = ns->next;
} while (ns != NULL); } while (ns != NULL);
} }
@@ -7979,7 +7979,7 @@ xmlDOMWrapRemoveNode(xmlDOMWrapCtxtPtr ctxt, xmlDocPtr doc,
ns = xmlDOMWrapStoreNs(doc, node->ns->href, ns = xmlDOMWrapStoreNs(doc, node->ns->href,
node->ns->prefix); node->ns->prefix);
if (ns == NULL) if (ns == NULL)
goto internal_error; ret = -1;
} }
if (ns != NULL) { if (ns != NULL) {
/* /*
@@ -7987,7 +7987,7 @@ xmlDOMWrapRemoveNode(xmlDOMWrapCtxtPtr ctxt, xmlDocPtr doc,
*/ */
if (xmlDOMWrapNSNormAddNsMapItem2(&list, &sizeList, if (xmlDOMWrapNSNormAddNsMapItem2(&list, &sizeList,
&nbList, node->ns, ns) == -1) &nbList, node->ns, ns) == -1)
goto internal_error; ret = -1;
} }
node->ns = ns; node->ns = ns;
} }
@@ -8019,12 +8019,7 @@ next_sibling:
if (list != NULL) if (list != NULL)
xmlFree(list); xmlFree(list);
return (0); return (ret);
internal_error:
if (list != NULL)
xmlFree(list);
return (-1);
} }
/* /*
@@ -8435,7 +8430,7 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
int optRemoveRedundantNS = int optRemoveRedundantNS =
((xmlDOMReconcileNSOptions) options & XML_DOM_RECONNS_REMOVEREDUND) ? 1 : 0; ((xmlDOMReconcileNSOptions) options & XML_DOM_RECONNS_REMOVEREDUND) ? 1 : 0;
xmlNsPtr *listRedund = NULL; xmlNsPtr *listRedund = NULL;
int sizeRedund = 0, nbRedund = 0, ret, i, j; int sizeRedund = 0, nbRedund = 0, ret = 0, i, j;
if ((elem == NULL) || (elem->doc == NULL) || if ((elem == NULL) || (elem->doc == NULL) ||
(elem->type != XML_ELEMENT_NODE)) (elem->type != XML_ELEMENT_NODE))
@@ -8464,7 +8459,7 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
*/ */
if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap, if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap,
elem->parent) == -1) elem->parent) == -1)
goto internal_error; ret = -1;
} }
parnsdone = 1; parnsdone = 1;
} }
@@ -8486,16 +8481,18 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
* Add it to the list of redundant ns-decls. * Add it to the list of redundant ns-decls.
*/ */
if (xmlDOMWrapNSNormAddNsMapItem2(&listRedund, if (xmlDOMWrapNSNormAddNsMapItem2(&listRedund,
&sizeRedund, &nbRedund, ns, mi->newNs) == -1) &sizeRedund, &nbRedund, ns, mi->newNs) == -1) {
goto internal_error; ret = -1;
/* } else {
* Remove the ns-decl from the element-node. /*
*/ * Remove the ns-decl from the element-node.
if (prevns) */
prevns->next = ns->next; if (prevns)
else prevns->next = ns->next;
cur->nsDef = ns->next; else
goto next_ns_decl; cur->nsDef = ns->next;
goto next_ns_decl;
}
} }
} }
} }
@@ -8525,7 +8522,7 @@ xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED,
*/ */
if (xmlDOMWrapNsMapAddItem(&nsMap, -1, ns, ns, if (xmlDOMWrapNsMapAddItem(&nsMap, -1, ns, ns,
depth) == NULL) depth) == NULL)
goto internal_error; ret = -1;
prevns = ns; prevns = ns;
next_ns_decl: next_ns_decl:
@@ -8545,7 +8542,7 @@ next_ns_decl:
((xmlNodePtr) elem->parent->doc != elem->parent)) { ((xmlNodePtr) elem->parent->doc != elem->parent)) {
if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap, if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap,
elem->parent) == -1) elem->parent) == -1)
goto internal_error; ret = -1;
} }
parnsdone = 1; parnsdone = 1;
} }
@@ -8584,7 +8581,7 @@ next_ns_decl:
&nsMap, depth, &nsMap, depth,
ancestorsOnly, ancestorsOnly,
(cur->type == XML_ATTRIBUTE_NODE) ? 1 : 0) == -1) (cur->type == XML_ATTRIBUTE_NODE) ? 1 : 0) == -1)
goto internal_error; ret = -1;
cur->ns = ns; cur->ns = ns;
ns_end: ns_end:
@@ -8644,11 +8641,6 @@ next_sibling:
} }
} while (cur != NULL); } while (cur != NULL);
ret = 0;
goto exit;
internal_error:
ret = -1;
exit:
if (listRedund) { if (listRedund) {
for (i = 0, j = 0; i < nbRedund; i++, j += 2) { for (i = 0, j = 0; i < nbRedund; i++, j += 2) {
xmlFreeNs(listRedund[j]); xmlFreeNs(listRedund[j]);
@@ -8729,8 +8721,6 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
parnsdone = 0; parnsdone = 0;
cur = node; cur = node;
if ((cur != NULL) && (cur->type == XML_NAMESPACE_DECL))
goto internal_error;
while (cur != NULL) { while (cur != NULL) {
/* /*
@@ -8762,7 +8752,8 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
/* /*
* TODO * TODO
*/ */
return (-1); ret = -1;
goto leave_node;
case XML_ELEMENT_NODE: case XML_ELEMENT_NODE:
curElem = cur; curElem = cur;
depth++; depth++;
@@ -8783,7 +8774,7 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
*/ */
if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap, if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap,
destParent) == -1) destParent) == -1)
goto internal_error; ret = -1;
parnsdone = 1; parnsdone = 1;
} }
for (ns = cur->nsDef; ns != NULL; ns = ns->next) { for (ns = cur->nsDef; ns != NULL; ns = ns->next) {
@@ -8812,7 +8803,7 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
*/ */
if (xmlDOMWrapNsMapAddItem(&nsMap, -1, if (xmlDOMWrapNsMapAddItem(&nsMap, -1,
ns, ns, depth) == NULL) ns, ns, depth) == NULL)
goto internal_error; ret = -1;
} }
} }
/* Falls through. */ /* Falls through. */
@@ -8824,7 +8815,7 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
if (! parnsdone) { if (! parnsdone) {
if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap, if (xmlDOMWrapNSNormGatherInScopeNs(&nsMap,
destParent) == -1) destParent) == -1)
goto internal_error; ret = -1;
parnsdone = 1; parnsdone = 1;
} }
/* /*
@@ -8858,7 +8849,7 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
*/ */
if (xmlDOMWrapNsMapAddItem(&nsMap, -1, if (xmlDOMWrapNsMapAddItem(&nsMap, -1,
cur->ns, ns, XML_TREE_NSMAP_CUSTOM) == NULL) cur->ns, ns, XML_TREE_NSMAP_CUSTOM) == NULL)
goto internal_error; ret = -1;
cur->ns = ns; cur->ns = ns;
} else { } else {
/* /*
@@ -8872,7 +8863,7 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt,
ancestorsOnly, ancestorsOnly,
/* ns-decls must be prefixed for attributes. */ /* ns-decls must be prefixed for attributes. */
(cur->type == XML_ATTRIBUTE_NODE) ? 1 : 0) == -1) (cur->type == XML_ATTRIBUTE_NODE) ? 1 : 0) == -1)
goto internal_error; ret = -1;
cur->ns = ns; cur->ns = ns;
} }
ns_end: ns_end:
@@ -8943,7 +8934,7 @@ ns_end:
case XML_COMMENT_NODE: case XML_COMMENT_NODE:
break; break;
default: default:
goto internal_error; ret = -1;
} }
/* /*
* Walk the tree. * Walk the tree.
@@ -8994,12 +8985,6 @@ leave_node:
} }
} }
goto exit;
internal_error:
ret = -1;
exit:
/* /*
* Cleanup. * Cleanup.
*/ */
@@ -9590,7 +9575,7 @@ xmlDOMWrapAdoptAttr(xmlDOMWrapCtxtPtr ctxt,
int options ATTRIBUTE_UNUSED) int options ATTRIBUTE_UNUSED)
{ {
xmlNodePtr cur; xmlNodePtr cur;
int adoptStr = 1; int adoptStr = 1, ret = 0;
if ((attr == NULL) || (destDoc == NULL)) if ((attr == NULL) || (destDoc == NULL))
return (-1); return (-1);
@@ -9616,14 +9601,14 @@ xmlDOMWrapAdoptAttr(xmlDOMWrapCtxtPtr ctxt,
*/ */
if (xmlSearchNsByNamespaceStrict(destDoc, destParent, attr->ns->href, if (xmlSearchNsByNamespaceStrict(destDoc, destParent, attr->ns->href,
&ns, 1) == -1) &ns, 1) == -1)
goto internal_error; ret = -1;
if (ns == NULL) { if (ns == NULL) {
ns = xmlDOMWrapNSNormDeclareNsForced(destDoc, destParent, ns = xmlDOMWrapNSNormDeclareNsForced(destDoc, destParent,
attr->ns->href, attr->ns->prefix, 1); attr->ns->href, attr->ns->prefix, 1);
} }
} }
if (ns == NULL) if (ns == NULL)
goto internal_error; ret = -1;
attr->ns = ns; attr->ns = ns;
} }
@@ -9634,10 +9619,10 @@ xmlDOMWrapAdoptAttr(xmlDOMWrapCtxtPtr ctxt,
* Walk content. * Walk content.
*/ */
if (attr->children == NULL) if (attr->children == NULL)
return (0); return (ret);
cur = attr->children; cur = attr->children;
if ((cur != NULL) && (cur->type == XML_NAMESPACE_DECL)) if ((cur != NULL) && (cur->type == XML_NAMESPACE_DECL))
goto internal_error; ret = -1;
while (cur != NULL) { while (cur != NULL) {
cur->doc = destDoc; cur->doc = destDoc;
switch (cur->type) { switch (cur->type) {
@@ -9682,9 +9667,8 @@ next_sibling:
goto next_sibling; goto next_sibling;
} }
} }
return (0);
internal_error: return (ret);
return (-1);
} }
/* /*