[Libguestfs] [PATCH] p2v: close the mexp handle if mexp_spawnv fails

Pino Toscano ptoscano at redhat.com
Fri Jul 25 15:36:17 UTC 2014


---
 p2v/miniexpect.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/p2v/miniexpect.c b/p2v/miniexpect.c
index 1baab5f..e1a184c 100644
--- a/p2v/miniexpect.c
+++ b/p2v/miniexpect.c
@@ -130,7 +130,7 @@ mexp_spawnl (const char *file, const char *arg, ...)
 mexp_h *
 mexp_spawnv (const char *file, char **argv)
 {
-  mexp_h *h;
+  mexp_h *h = NULL;
   int fd = -1;
   int err;
   char slave[1024];
@@ -206,6 +206,8 @@ mexp_spawnv (const char *file, char **argv)
     close (fd);
   if (pid > 0)
     waitpid (pid, NULL, 0);
+  if (h != NULL)
+    mexp_close (h);
   errno = err;
   return NULL;
 }
-- 
1.9.3




More information about the Libguestfs mailing list