]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: fix NULL deref when exporting ports
authorDaniel P. Berrangé <berrange@redhat.com>
Tue, 18 Jun 2019 17:33:04 +0000 (18:33 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Wed, 19 Jun 2019 07:47:10 +0000 (08:47 +0100)
Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/conf/virnetworkobj.c

index adf144fae200d8c1e2e7b02526d9eb39d6891891..12cefebaa8010b67f2f79b76bae450b589a02b72 100644 (file)
@@ -1810,10 +1810,12 @@ virNetworkObjPortListExport(virNetworkPtr net,
     };
     int ret = -1;
 
-    *ports = NULL;
+    if (ports) {
+        *ports = NULL;
 
-    if (ports && VIR_ALLOC_N(data.ports, virHashSize(obj->ports) + 1) < 0)
-        goto cleanup;
+        if (VIR_ALLOC_N(data.ports, virHashSize(obj->ports) + 1) < 0)
+            goto cleanup;
+    }
 
     virHashForEach(obj->ports, virNetworkObjPortListExportCallback, &data);