[libvirt] [PATCH 1/2] leaseshelper: Skip entries missing expiry time on INIT action

Peter Krempa pkrempa at redhat.com
Wed Dec 3 17:29:50 UTC 2014


Coverity pointed out that on other places we always check the return
value from virJSONValueObjectGetNumberLong() but not in the new addition
in leaseshelper. To solve the issue and also be more robust in case
somebody would corrupt the file, skip outputing of the lease entry in
case the expiry time is missing.
---
 src/network/leaseshelper.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index 96a1de2..9628cee 100644
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -397,7 +397,10 @@ main(int argc, char **argv)
                 goto cleanup;
             }
             if (!strchr(ip_tmp, ':')) {
-                virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime);
+                if (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time",
+                                                    &expirytime) < 0)
+                    continue;
+
                 printf("%lld %s %s %s %s\n",
                        expirytime,
                        virJSONValueObjectGetString(lease_tmp, "mac-address"),
@@ -418,7 +421,10 @@ main(int argc, char **argv)
                     goto cleanup;
                 }
                 if (strchr(ip_tmp, ':')) {
-                    virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime);
+                    if (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time",
+                                                        &expirytime) < 0)
+                        continue;
+
                     printf("%lld %s %s %s %s\n",
                            expirytime,
                            virJSONValueObjectGetString(lease_tmp, "iaid"),
-- 
2.1.0




More information about the libvir-list mailing list