From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 21 Jan 2021 16:35:12 +0000 (+0100)
Subject: virNetworkDHCPLeaseTimeDefParseXML: Output error when 'expiry' can't be parsed
X-Git-Tag: v7.1.0-rc1~514
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=196ebfc24086b358f5110177b4b9f8e35b7daed0;p=thirdparty%2Flibvirt.git

virNetworkDHCPLeaseTimeDefParseXML: Output error when 'expiry' can't be parsed

virStrToLong_ul doesn't report it's own error.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1918674
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 4f1115e103..ff7a56f4f4 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -418,8 +418,11 @@ virNetworkDHCPLeaseTimeDefParseXML(virNetworkDHCPLeaseTimeDefPtr *lease,
     if (!(expirystr = virXMLPropString(node, "expiry")))
         return 0;
 
-    if (virStrToLong_ul(expirystr, NULL, 10, &expiry) < 0)
+    if (virStrToLong_ul(expirystr, NULL, 10, &expiry) < 0) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("failed to parse expiry value '%s'"), expirystr);
         return -1;
+    }
 
     if ((unitstr = virXMLPropString(node, "unit"))) {
         if ((unit = virNetworkDHCPLeaseTimeUnitTypeFromString(unitstr)) < 0) {