Fix two memory leaks in domain conf and LXC code

diff --git a/ChangeLog b/ChangeLog
index 84b302bd9f74848280e7a7e8edf1e160761d680b..05474cf1d0a448e9793dd46f1624b6461d0df9fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 21 11:37:14 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/domain_conf.c: Fix two memory leaks in virDomainLoadConfig
+       * src/lxc_driver.c: Fix leak of capabilities object in driver
+       shutdown code
+
 Fri Nov 21 10:20:14 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/remote_internal.c: Return VIR_NO_SUPPORT if requested

diff --git a/src/domain_conf.c b/src/domain_conf.c
index 39e60d45978203863a77e4382cdc0f7c5a79d96d..414b7ff944c6d5db7b021d31491eefc0906a1f28 100644 (file)
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -3279,6 +3279,8 @@ virDomainObjPtr virDomainLoadConfig(virConnectPtr conn,
     if (notify)
         (*notify)(dom, newVM, opaque);
 
+    VIR_FREE(configFile);
+    VIR_FREE(autostartLink);
     return dom;
 
 error:

diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index c4ba24ac70e647975f5bd1461912404dfbd17a5d..cebc2ca2fe6ea68c0f8367dc2e95ca8cf28d9437 100644 (file)
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1071,6 +1071,7 @@ static int lxcStartup(void)
 
 static void lxcFreeDriver(lxc_driver_t *driver)
 {
+    virCapabilitiesFree(driver->caps);
     VIR_FREE(driver->configDir);
     VIR_FREE(driver->autostartDir);
     VIR_FREE(driver->stateDir);