clang on Fedora started to complain about some calls to g_new0()
we're making in vbox_snapshot_conf.c. Specifically, we're passing
zero as number of elements to allocate. And while usually SA
tools are not clever, in this specific case clang is right.
There are three cases where such call is made, but all of them
later use VIR_EXPAND_N() to allocate more memory (if needed). But
VIR_EXPAND_N() accepts a variable set to NULL happily.

Therefore, just drop those three calls to g_new0(..., 0) and let
VIR_EXPAND_N() allocate memory.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/vbox/vbox_snapshot_conf.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c
index 89cd685954..b424648368 100644
--- a/src/vbox/vbox_snapshot_conf.c
+++ b/src/vbox/vbox_snapshot_conf.c
@@ -460,8 +460,6 @@ virVBoxSnapshotConfAllChildren(virVBoxSnapshotConfHardDisk *disk,
     size_t i = 0;
     size_t j = 0;
 
-    ret = g_new0(virVBoxSnapshotConfHardDisk *, 0);
-
     for (i = 0; i < disk->nchildren; i++) {
         size_t tempSize = virVBoxSnapshotConfAllChildren(disk->children[i], &tempList);
         VIR_EXPAND_N(ret, returnSize, tempSize);
@@ -1314,8 +1312,6 @@ virVBoxSnapshotConfRemoveFakeDisks(virVBoxSnapshotConfMachine *machine)
     virVBoxSnapshotConfHardDisk **tempList = NULL;
     virVBoxSnapshotConfHardDisk **diskList = NULL;
 
-    diskList = g_new0(virVBoxSnapshotConfHardDisk *, 0);
-
     for (i = 0; i < machine->mediaRegistry->ndisks; i++) {
         tempSize = virVBoxSnapshotConfAllChildren(machine->mediaRegistry->disks[i], &tempList);
         VIR_EXPAND_N(diskList, diskSize, tempSize);
@@ -1364,8 +1360,6 @@ virVBoxSnapshotConfDiskIsInMediaRegistry(virVBoxSnapshotConfMachine *machine,
     virVBoxSnapshotConfHardDisk **tempList = NULL;
     virVBoxSnapshotConfHardDisk **diskList = NULL;
 
-    diskList = g_new0(virVBoxSnapshotConfHardDisk *, 0);
-
     for (i = 0; i < machine->mediaRegistry->ndisks; i++) {
         tempSize = virVBoxSnapshotConfAllChildren(machine->mediaRegistry->disks[i], &tempList);
         VIR_EXPAND_N(diskList, diskSize, tempSize);
-- 
2.43.2
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

On Fri, Apr 12, 2024 at 08:52:37PM +0200, Michal Privoznik wrote:
> clang on Fedora started to complain about some calls to g_new0()
> we're making in vbox_snapshot_conf.c. Specifically, we're passing
> zero as number of elements to allocate. And while usually SA
> tools are not clever, in this specific case clang is right.
> There are three cases where such call is made, but all of them
> later use VIR_EXPAND_N() to allocate more memory (if needed). But
> VIR_EXPAND_N() accepts a variable set to NULL happily.
> 
> Therefore, just drop those three calls to g_new0(..., 0) and let
> VIR_EXPAND_N() allocate memory.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  src/vbox/vbox_snapshot_conf.c | 6 ------
>  1 file changed, 6 deletions(-)

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org