External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 18:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: fix g_new0 allocation

Browse Source 
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>
This commit is contained in:
Pavel Hrdina 2020-10-12 19:45:37 +02:00
parent accdc0e773
commit 8a666dccda
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/virinterfaceobj.c
View File

@ -320,7 +320,7 @@ virInterfaceObjListExport(virConnectPtr conn,
virObjectRWLockRead(ifaceobjs); virObjectRWLockRead(ifaceobjs);
if (ifaces) if (ifaces)
data.ifaces = g_new0(virInterfacePtr, virHashSize(ifaceobjs->objsName)); data.ifaces = g_new0(virInterfacePtr, virHashSize(ifaceobjs->objsName) + 1);
virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback, &data); virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback, &data);

4
src/conf/virnetworkobj.c
View File

@ -1407,7 +1407,7 @@ virNetworkObjListExport(virConnectPtr conn,
virObjectRWLockRead(netobjs); virObjectRWLockRead(netobjs);
if (nets) if (nets)
data.nets = g_new0(virNetworkPtr, virHashSize(netobjs->objs)); data.nets = g_new0(virNetworkPtr, virHashSize(netobjs->objs) + 1);
virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data); virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data);
@ -1801,7 +1801,7 @@ virNetworkObjPortListExport(virNetworkPtr net,
if (ports) { if (ports) {
*ports = NULL; *ports = NULL;
data.ports = g_new0(virNetworkPortPtr, virHashSize(obj->ports)); data.ports = g_new0(virNetworkPortPtr, virHashSize(obj->ports) + 1);
} }
virHashForEach(obj->ports, virNetworkObjPortListExportCallback, &data); virHashForEach(obj->ports, virNetworkObjPortListExportCallback, &data);

2
src/conf/virnodedeviceobj.c
View File

@ -931,7 +931,7 @@ virNodeDeviceObjListExport(virConnectPtr conn,
virObjectRWLockRead(devs); virObjectRWLockRead(devs);
if (devices) if (devices)
data.devices = g_new0(virNodeDevicePtr, virHashSize(devs->objs)); data.devices = g_new0(virNodeDevicePtr, virHashSize(devs->objs) + 1);
virHashForEach(devs->objs, virNodeDeviceObjListExportCallback, &data); virHashForEach(devs->objs, virNodeDeviceObjListExportCallback, &data);
virObjectRWUnlock(devs); virObjectRWUnlock(devs);