[Libvir] [PATCH] Plug skipped-qemudCleanup leak.

Jim Meyering jim at meyering.net
Mon Mar 3 12:34:34 UTC 2008


And another:

	Plug skipped-qemudCleanup leak.
        * qemud/qemud.c (main): Call qemudCleanup also upon failure.
        Otherwise, an error return would skip it and induce leaks.

Signed-off-by: Jim Meyering <meyering at redhat.com>
---
 ChangeLog     |    6 ++++++
 qemud/qemud.c |    3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 049f515..81452ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-03  Jim Meyering  <meyering at redhat.com>
+
+	Plug skipped-qemudCleanup leak.
+	* qemud/qemud.c (main): Call qemudCleanup also upon failure.
+	Otherwise, an error return would skip it and induce leaks.
+
 Mon Mar  3 07:16:35 CET 2008 Daniel Veillard <veillard at redhat.com>

 	* include/libvirt/libvirt.h include/libvirt/libvirt.h.in:
diff --git a/qemud/qemud.c b/qemud/qemud.c
index 851e83e..7ccc9ee 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -2166,8 +2166,6 @@ int main(int argc, char **argv) {

     qemudRunLoop(server);

-    qemudCleanup(server);
-
     close(sigwrite);

     if (godaemon)
@@ -2181,6 +2179,7 @@ int main(int argc, char **argv) {
         unlink (pid_file);

  error1:
+    qemudCleanup(server);
     return ret;
 }

--
1.5.4.3.366.g55277




More information about the libvir-list mailing list