]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Don't report OOM error on xmlCopyNode failure
authorPeter Krempa <pkrempa@redhat.com>
Tue, 23 Feb 2021 17:10:41 +0000 (18:10 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 2 Mar 2021 08:50:19 +0000 (09:50 +0100)
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>
src/conf/domain_conf.c
src/test/test_driver.c

index a27fac4a29661ef77d1a9837b3b0a7d165c27bd1..f194909b131b16fefe9ed9574b3f9300723de225 100644 (file)
@@ -30459,7 +30459,8 @@ virDomainDefSetMetadata(virDomainDefPtr def,
                 def->metadata = virXMLNewNode(NULL, "metadata");
 
             if (!(new = xmlCopyNode(doc->children, 1))) {
-                virReportOOMError();
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("Failed to copy XML node"));
                 return -1;
             }
         }
index bca1297d1dd949a4d3d1b8b6abaab5a0a7d26580..71ab04aa1a9ff85f1d1b205b3701d368a4b55d52 100644 (file)
@@ -224,7 +224,8 @@ testDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
     for (i = 0; i < n; i++) {
         xmlNodePtr newnode = xmlCopyNode(nodes[i], 1);
         if (!newnode) {
-            virReportOOMError();
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to copy XML node"));
             goto error;
         }
 
@@ -787,7 +788,8 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type)
 
         ret = xmlCopyNode(xmlDocGetRootElement(doc), 1);
         if (!ret) {
-            virReportOOMError();
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to copy XML node"));
             goto error;
         }
         xmlReplaceNode(node, ret);