[libvirt] [PATCHv2 3/4] net-dhcp-leases: Private implementation inside network driver

Nehal J Wani nehaljw.kkd1 at gmail.com
Fri Sep 13 09:10:37 UTC 2013


Just realized that obj should be non-null. Small diff to fix this:

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 2cdea56..3e93893 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3020,7 +3020,8 @@ networkGetDHCPLeases(virNetworkPtr network,

     virCheckFlags(0, -1);

-    obj = networkObjFromNetwork(network);
+    if (!(obj = networkObjFromNetwork(network)))
+        return rv;

     if (virNetworkGetDHCPLeasesEnsureACL(network->conn, obj->def) < 0)
         goto cleanup;
@@ -3044,7 +3045,8 @@ networkGetDHCPLeasesForMAC(virNetworkPtr network,

     virCheckFlags(0, -1);

-    obj = networkObjFromNetwork(network);
+    if (!(obj = networkObjFromNetwork(network)))
+        return rv;

     if (virNetworkGetDHCPLeasesForMACEnsureACL(network->conn, obj->def) <
0)
         goto cleanup;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20130913/9fe8c352/attachment-0001.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 3.diff
Type: application/octet-stream
Size: 795 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20130913/9fe8c352/attachment-0001.obj>


More information about the libvir-list mailing list