From cd6eefd3e887c6a0209f1cdbc1c4d6e5ca69aa76 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 3 Mar 2008 13:16:31 +0000 Subject: [PATCH] Plug skipped-qemudCleanup leak. * qemud/qemud.c (main): Call qemudCleanup also upon failure. Otherwise, an error return would skip it and induce leaks. --- ChangeLog | 4 ++++ qemud/qemud.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a73c34b67c..4a08b00b0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Mon Mar 3 14:14:03 CET 2008 Jim Meyering + Plug skipped-qemudCleanup leak. + * qemud/qemud.c (main): Call qemudCleanup also upon failure. + Otherwise, an error return would skip it and induce leaks. + Plug remoteReadConfigFile leak. * qemud/qemud.c (remoteReadConfigFile): Be careful to free "conf" after a successful virConfReadFile. diff --git a/qemud/qemud.c b/qemud/qemud.c index 851e83ed70..7ccc9ee00b 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; }