check the pid is > 0 before calling waitpid()
authorAngus Salkeld <asalkeld@redhat.com>
Mon, 14 Mar 2011 11:40:12 +0000 (22:40 +1100)
committerRichard W.M. Jones <rjones@redhat.com>
Mon, 21 Mar 2011 11:29:07 +0000 (11:29 +0000)
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
(cherry picked from commit 6f7c1a9f9d76bdf9f112e12e1508531fb41abfb2)

src/launch.c

index 30082d6..386d1a1 100644 (file)
@@ -758,7 +758,7 @@ launch_appliance (guestfs_h *g)
   }
   if (g->pid > 0) kill (g->pid, 9);
   if (g->recoverypid > 0) kill (g->recoverypid, 9);
-  waitpid (g->pid, NULL, 0);
+  if (g->pid > 0) waitpid (g->pid, NULL, 0);
   if (g->recoverypid > 0) waitpid (g->recoverypid, NULL, 0);
   g->fd[0] = -1;
   g->fd[1] = -1;