From 7271a92bec8edf7917f61fe5aa43dc244645297f Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 5 Nov 2008 14:24:21 +0000 Subject: [PATCH] plug two leaks and fix a diagnostic * src/qemu_conf.c (qemudLoadDriverConfig): Don't leak ->vncListen. Fix an erroneous copy-and-pasted diagnostic. * src/qemu_driver.c (qemudShutdown): Don't leak another ->vncListen. --- ChangeLog | 8 ++++++++ src/qemu_conf.c | 3 ++- src/qemu_driver.c | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d5926b2d84..723fcafdf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ +Wed Nov 5 15:22:12 CET 2008 Jim Meyering + + plug two leaks and fix a diagnostic + * src/qemu_conf.c (qemudLoadDriverConfig): Don't leak ->vncListen. + Fix an erroneous copy-and-pasted diagnostic. + * src/qemu_driver.c (qemudShutdown): Don't leak another ->vncListen. + Wed Nov 5 12:41:00 CET 2008 Chris Lalancette + * configure.in, src/storage_backend_logical.c: Call vgscan before attempting to scan logical volumes. This makes sure we've "touched" any logical volumes, so they appear in the subsequent "pvs" call. diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 54ac23d237..0e3b959884 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -118,9 +118,10 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, p = virConfGetValue (conf, "vnc_listen"); CHECK_TYPE ("vnc_listen", VIR_CONF_STRING); if (p && p->str) { + VIR_FREE(driver->vncListen); if (!(driver->vncListen = strdup(p->str))) { qemudReportError(NULL, NULL, NULL, VIR_ERR_NO_MEMORY, - "%s", _("failed to allocate vncTLSx509certdir")); + "%s", _("failed to allocate vnc_listen")); virConfFree(conf); return -1; } diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 4adeb7322c..5d108edc4d 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -314,6 +314,7 @@ qemudShutdown(void) { VIR_FREE(qemu_driver->configDir); VIR_FREE(qemu_driver->autostartDir); VIR_FREE(qemu_driver->vncTLSx509certdir); + VIR_FREE(qemu_driver->vncListen); /* Free domain callback list */ virDomainEventCallbackListFree(qemu_driver->domainEventCallbacks); -- GitLab