Avoid segfault upon early libvirtd failure.

* qemud/qemud.c (main): Don't call qemudCleanup on an
uninitialized pointer.

diff --git a/ChangeLog b/ChangeLog
index a4f37f32c7f88a6f47805040176df0e651747560..d331a4cb82d4eaaedb65f0c02fd7047d84e2adf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar  3 19:09:51 CET 2008 Jim Meyering <meyering@redhat.com>
+
+       Avoid segfault upon early libvirtd failure.
+       * qemud/qemud.c (main): Don't call qemudCleanup on an
+       uninitialized pointer.
+
 Mon Mar  3 15:40:31 CET 2008 Daniel Veillard <veillard@redhat.com>
 
        * NEWS configure.in libvirt.spec.in docs/* include/libvirt/libvirt.h

diff --git a/qemud/qemud.c b/qemud/qemud.c
index 96fdf32f227eb26c8cf72fed4d3d1f43da1ca5ae..b6b82edb9deaf727b60a11d9764f2bc239d5dd26 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -2025,7 +2025,7 @@ libvirt management daemon:\n\
 
 #define MAX_LISTEN 5
 int main(int argc, char **argv) {
-    struct qemud_server *server;
+    struct qemud_server *server = NULL;
     struct sigaction sig_action;
     int sigpipe[2];
     const char *pid_file = NULL;
@@ -2180,7 +2180,8 @@ int main(int argc, char **argv) {
         unlink (pid_file);
 
  error1:
-    qemudCleanup(server);
+    if (server)
+        qemudCleanup(server);
     return ret;
 }