External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Don't report OOM error on xmlCopyNode failure

Browse Source 
Out of memory isn't the only reason the function can fail. Add a message
stating that copying of a XML node failed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Peter Krempa 2021-02-23 18:10:41 +01:00
parent ec6e2a2c97
commit c3a5c67a84
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/domain_conf.c
View File

@ -30459,7 +30459,8 @@ virDomainDefSetMetadata(virDomainDefPtr def,
def->metadata = virXMLNewNode(NULL, "metadata"); def->metadata = virXMLNewNode(NULL, "metadata");
if (!(new = xmlCopyNode(doc->children, 1))) { if (!(new = xmlCopyNode(doc->children, 1))) {
virReportOOMError(); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to copy XML node"));
return -1; return -1;
} }
} }

6
src/test/test_driver.c
View File

@ -224,7 +224,8 @@ testDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
xmlNodePtr newnode = xmlCopyNode(nodes[i], 1); xmlNodePtr newnode = xmlCopyNode(nodes[i], 1);
if (!newnode) { if (!newnode) {
virReportOOMError(); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to copy XML node"));
goto error; goto error;
} }
@ -787,7 +788,8 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type)
ret = xmlCopyNode(xmlDocGetRootElement(doc), 1); ret = xmlCopyNode(xmlDocGetRootElement(doc), 1);
if (!ret) { if (!ret) {
virReportOOMError(); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to copy XML node"));
goto error; goto error;
} }
xmlReplaceNode(node, ret); xmlReplaceNode(node, ret);