]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: fix g_new0 allocation
authorPavel Hrdina <phrdina@redhat.com>
Mon, 12 Oct 2020 17:45:37 +0000 (19:45 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Tue, 13 Oct 2020 07:10:11 +0000 (09:10 +0200)
Fixes commit <a5d88ffe0ad9b5d5314ab0058c5b363f9f79b8ee> which changed
allocation from VIR_ALLOC_N to g_new0 but missed some +1 on number of
allocated elements.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
src/conf/virinterfaceobj.c
src/conf/virnetworkobj.c
src/conf/virnodedeviceobj.c

index 5a5fd65e1409605af7937996543eda5c985418bd..e08b4b9b0fd9da43e7f1ab311838afd86df60ac4 100644 (file)
@@ -320,7 +320,7 @@ virInterfaceObjListExport(virConnectPtr conn,
 
     virObjectRWLockRead(ifaceobjs);
     if (ifaces)
-        data.ifaces = g_new0(virInterfacePtr, virHashSize(ifaceobjs->objsName));
+        data.ifaces = g_new0(virInterfacePtr, virHashSize(ifaceobjs->objsName) + 1);
 
     virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback, &data);
 
index 1fcfa9cdc21ebc72afc2e3fa6651fdd0dd7a7061..a2835ebf8e82defe99635dc96022dc6512e98528 100644 (file)
@@ -1407,7 +1407,7 @@ virNetworkObjListExport(virConnectPtr conn,
 
     virObjectRWLockRead(netobjs);
     if (nets)
-        data.nets = g_new0(virNetworkPtr, virHashSize(netobjs->objs));
+        data.nets = g_new0(virNetworkPtr, virHashSize(netobjs->objs) + 1);
 
     virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data);
 
@@ -1801,7 +1801,7 @@ virNetworkObjPortListExport(virNetworkPtr net,
     if (ports) {
         *ports = NULL;
 
-        data.ports = g_new0(virNetworkPortPtr, virHashSize(obj->ports));
+        data.ports = g_new0(virNetworkPortPtr, virHashSize(obj->ports) + 1);
     }
 
     virHashForEach(obj->ports, virNetworkObjPortListExportCallback, &data);
index 28905c67b6c606f7c3bed79845c69f0a0f799adb..9af80b803663c79bd98c7686a202ddf0353d36fd 100644 (file)
@@ -931,7 +931,7 @@ virNodeDeviceObjListExport(virConnectPtr conn,
 
     virObjectRWLockRead(devs);
     if (devices)
-        data.devices = g_new0(virNodeDevicePtr, virHashSize(devs->objs));
+        data.devices = g_new0(virNodeDevicePtr, virHashSize(devs->objs) + 1);
 
     virHashForEach(devs->objs, virNodeDeviceObjListExportCallback, &data);
     virObjectRWUnlock(devs);