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

[PATCH] virNetworkDHCPLeaseTimeDefParseXML: Output error when 'expiry' can't be parsed

Peter Krempa posted 1 patch 3 years, 3 months ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/b2c0001811a6794ecba87adfdc243b8d9e17f53a.1611247219.git.pkrempa@redhat.com

src/conf/network_conf.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH] virNetworkDHCPLeaseTimeDefParseXML: Output error when 'expiry' can't be parsed

Posted by Peter Krempa 3 years, 3 months ago

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>
---
 src/conf/network_conf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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) {
-- 
2.29.2

Re: [PATCH] virNetworkDHCPLeaseTimeDefParseXML: Output error when 'expiry' can't be parsed

Posted by Laine Stump 3 years, 3 months ago

On 1/21/21 11:40 AM, Peter Krempa wrote:
> 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>

> ---
>   src/conf/network_conf.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> 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) {