From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 3 Feb 2021 12:42:00 +0000 (+0100)
Subject: virNWFilterVarCombIter: Allocate 'iter' member separately
X-Git-Tag: v7.1.0-rc1~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=add18b06c742e324ef1328e150c531f63ea513c3;p=thirdparty%2Flibvirt.git

virNWFilterVarCombIter: Allocate 'iter' member separately

Switch to the more common approach of having arrays allocated separately
rather than trailing the struct.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 18b64e373b..1be492759a 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -304,6 +304,8 @@ virNWFilterVarCombIterFree(virNWFilterVarCombIterPtr ci)
     for (i = 0; i < ci->nIter; i++)
         g_free(ci->iter[i].varNames);
 
+    g_free(ci->iter);
+
     g_free(ci);
 }
 
@@ -465,8 +467,8 @@ virNWFilterVarCombIterCreate(GHashTable *hash,
     int iterIndex = -1;
     unsigned int nextIntIterId = VIR_NWFILTER_MAX_ITERID + 1;
 
-    if (VIR_ALLOC_VAR(res, virNWFilterVarCombIterEntry, 1 + nVarAccess) < 0)
-        return NULL;
+    res = g_new0(virNWFilterVarCombIter, 1);
+    res->iter = g_new0(virNWFilterVarCombIterEntry, nVarAccess + 1);
 
     res->hashTable = hash;
 
diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h
index 05a6a43399..59068b8ae9 100644
--- a/src/conf/nwfilter_params.h
+++ b/src/conf/nwfilter_params.h
@@ -137,7 +137,7 @@ typedef virNWFilterVarCombIter *virNWFilterVarCombIterPtr;
 struct _virNWFilterVarCombIter {
     GHashTable *hashTable;
     size_t nIter;
-    virNWFilterVarCombIterEntry iter[0];
+    virNWFilterVarCombIterEntryPtr iter;
 };
 virNWFilterVarCombIterPtr virNWFilterVarCombIterCreate(
                              GHashTable *hash,