diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-04-11 17:43:47 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-04-11 22:48:55 +0100 |
| commit | ce6819c96bd063ba8c4f8e78e305538ebc779aea (patch) | |
| tree | 08470d2dcc5da98f55f714542280656a569064cd | |
| parent | 711c00d0bdcb2b2dbafc387198ca4901d2414ed3 (diff) | |
| download | libguestfs-ce6819c96bd063ba8c4f8e78e305538ebc779aea.tar.gz libguestfs-ce6819c96bd063ba8c4f8e78e305538ebc779aea.tar.xz libguestfs-ce6819c96bd063ba8c4f8e78e305538ebc779aea.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.
(cherry picked from commit 0f7de2279a4af0bb259c9e36fca5e5c3aa835301)
| -rw-r--r-- | src/launch.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/launch.c b/src/launch.c index 1a7c8236..1f2c2a8d 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")); |