]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: fix use after free
authorRyan Moeller <ryan@ixsystems.com>
Mon, 24 Feb 2020 06:46:14 +0000 (01:46 -0500)
committerDaniel P. Berrangé <berrange@redhat.com>
Mon, 24 Feb 2020 17:24:49 +0000 (17:24 +0000)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
src/conf/virnetworkobj.c

index 299cdba52d74e9bb567b5c50bff7f6ac0de4a2ef..b2affaacd38980c55092e5e1ef06497b6c22f34d 100644 (file)
@@ -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;