Plug remoteReadConfigFile leak.

* qemud/qemud.c (remoteReadConfigFile): Be careful to free
"conf" after a successful virConfReadFile.

diff --git a/ChangeLog b/ChangeLog
index 109683887d0eade018da4129500ccb1a84384675..a73c34b67cec449b0199928ca01adbe0378eb1c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Mon Mar  3 14:14:03 CET 2008 Jim Meyering <meyering@redhat.com>
 
+       Plug remoteReadConfigFile leak.
+       * qemud/qemud.c (remoteReadConfigFile): Be careful to free
+       "conf" after a successful virConfReadFile.
+
        Plug two leaks: host.migrateTrans and arch.name
        * src/capabilities.c (virCapabilitiesFree): Free host.migrateTrans.
        (virCapabilitiesFreeGuest): Free arch.name member.

diff --git a/qemud/qemud.c b/qemud/qemud.c
index 9ce9edde817ea258373ee632f78f65ca2d67aaeb..851e83ed70dad20b646cefd6ba025d1d7d0c9e64 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -1877,7 +1877,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename)
     GET_CONF_STR (conf, filename, tcp_port);
 
     if (remoteConfigGetAuth(conf, "auth_unix_rw", &auth_unix_rw, filename) < 0)
-        return -1;
+        goto free_and_fail;
 #if HAVE_POLKIT
     /* Change default perms to be wide-open if PolicyKit is enabled.
      * Admin can always override in config file
@@ -1886,11 +1886,11 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename)
         unix_sock_rw_mask = 0777;
 #endif
     if (remoteConfigGetAuth(conf, "auth_unix_ro", &auth_unix_ro, filename) < 0)
-        return -1;
+        goto free_and_fail;
     if (remoteConfigGetAuth(conf, "auth_tcp", &auth_tcp, filename) < 0)
-        return -1;
+        goto free_and_fail;
     if (remoteConfigGetAuth(conf, "auth_tls", &auth_tls, filename) < 0)
-        return -1;
+        goto free_and_fail;
 
     GET_CONF_STR (conf, filename, unix_sock_group);
     if (unix_sock_group) {