From 3fe52b7818c6d5317f344b203ab0874e91dd3d42 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 9 Aug 2022 13:37:32 +0200 Subject: [PATCH] bridge_driver: Use g_autoptr() for virMacMap MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Let's annotate virMacMap variables in bridge_driver.c with g_autoptr() so that they are automatically freed upon error. This may look like a needless commit, since there's no memory leak currently, but it simplifies the next commit. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- src/network/bridge_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7ad9f278a2..a07af55390 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -450,7 +450,7 @@ networkUpdateState(virNetworkObj *obj, virNetworkDef *def; virNetworkDriverState *driver = opaque; g_autoptr(dnsmasqCaps) dnsmasq_caps = networkGetDnsmasqCaps(driver); - virMacMap *macmap; + g_autoptr(virMacMap) macmap = NULL; g_autofree char *macMapFile = NULL; VIR_LOCK_GUARD lock = virObjectLockGuard(obj); @@ -476,6 +476,7 @@ networkUpdateState(virNetworkObj *obj, return -1; virNetworkObjSetMacMap(obj, macmap); + macmap = NULL; break; @@ -1938,7 +1939,7 @@ networkStartNetworkVirtual(virNetworkDriverState *driver, virErrorPtr save_err = NULL; virNetworkIPDef *ipdef; virNetDevIPRoute *routedef; - virMacMap *macmap; + g_autoptr(virMacMap) macmap = NULL; g_autofree char *macMapFile = NULL; bool dnsmasqStarted = false; bool devOnline = false; -- 2.47.3