From: Ryan Moeller <ryan@ixsystems.com>
Date: Mon, 24 Feb 2020 06:46:14 +0000 (-0500)
Subject: conf: fix use after free
X-Git-Tag: v6.1.0-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=679fcfe96923231d065d3e98e0251f1c3282a971;p=thirdparty%2Flibvirt.git

conf: fix use after free

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
---

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index 299cdba52d..b2affaacd3 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -1886,7 +1886,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net,
     }
 
     while ((rc = virDirRead(dh, &de, dir)) > 0) {
-        char *file = NULL;
+        g_autofree char *file = NULL;
 
         if (!virStringStripSuffix(de->d_name, ".xml"))
             continue;
@@ -1894,9 +1894,6 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net,
         file = g_strdup_printf("%s/%s.xml", dir, de->d_name);
 
         portdef = virNetworkPortDefParseFile(file);
-        VIR_FREE(file);
-        file = NULL;
-
         if (!portdef) {
             VIR_WARN("Cannot parse port %s", file);
             continue;