[Libguestfs] [PATCH] check the pid is > 0 before calling waitpid()

[Richard W.M. Jones]

On Tue, Mar 15, 2011 at 10:52:33PM +1100, Angus Salkeld wrote:
> On Mon, Mar 14, 2011 at 11:46:21AM +0000, Richard W.M. Jones wrote:
> > On Mon, Mar 14, 2011 at 10:40:12PM +1100, Angus Salkeld wrote:
> > > Signed-off-by: Angus Salkeld <asalkeld at redhat.com>
> > > ---
> > >  src/launch.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/src/launch.c b/src/launch.c
> > > index e50985d..8de2857 100644
> > > --- a/src/launch.c
> > > +++ b/src/launch.c
> > > @@ -769,7 +769,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;
> > > -- 
> > > 1.7.4.1
> > 
> > ACK.  I'll push this in a moment.
> > 
> > Note that for any changes that you would like added to the RHEL 6.2
> > package, you must file a bug:
> > https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Red%20Hat%20Enterprise%20Linux%206
> > 
> I finally managed to build and test this. I missed a simerlar change in src/guestfs.c
> So we need another little patch (attached).

Thanks, this has been pushed upstream.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://libguestfs.org