summaryrefslogtreecommitdiffstats
path: root/src/launch.c
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-04-11 17:43:47 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-04-11 17:43:47 +0100
commit0f7de2279a4af0bb259c9e36fca5e5c3aa835301 (patch)
tree2ea02ba15766a48bc04295652b52bfaeb420152d /src/launch.c
parentf237ae2ad61ad583e5eacf5759b25c32bb7538a1 (diff)
downloadlibguestfs-0f7de2279a4af0bb259c9e36fca5e5c3aa835301.tar.gz
libguestfs-0f7de2279a4af0bb259c9e36fca5e5c3aa835301.tar.xz
libguestfs-0f7de2279a4af0bb259c9e36fca5e5c3aa835301.zip
launch: Set error when qemu fails early during launch (RHBZ#811650).
This caused the Python bindings (and probably others) to segfault because guestfs_last_error(g) would return NULL.
Diffstat (limited to 'src/launch.c')
-rw-r--r--src/launch.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/launch.c b/src/launch.c
index 1b9ca9b0..6388fd27 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -963,7 +963,10 @@ launch_appliance (guestfs_h *g)
r = guestfs___recv_from_daemon (g, &size, &buf);
free (buf);
- if (r == -1) return -1;
+ if (r == -1) {
+ error (g, _("guestfs_launch failed, see earlier error messages"));
+ goto cleanup1;
+ }
if (size != GUESTFS_LAUNCH_FLAG) {
error (g, _("guestfs_launch failed, see earlier error messages"));