|
 |
1c1f09 |
From 4b202fd478ccbdb504c9c2a52b5ef4ddcc50838f Mon Sep 17 00:00:00 2001
|
|
|
1c1f09 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
1c1f09 |
Date: Tue, 11 Apr 2017 10:47:56 +0100
|
|
|
1c1f09 |
Subject: [PATCH] Fix crash when no error is set after connection failure
|
|
|
1c1f09 |
|
|
|
1c1f09 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
1c1f09 |
(cherry picked from commit a51e6a6973e9bdfcba0e52d3f9ee37686cd95db9)
|
|
|
1c1f09 |
---
|
|
|
1c1f09 |
src/vncconnection.c | 7 ++++---
|
|
|
1c1f09 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
1c1f09 |
|
|
|
1c1f09 |
diff --git a/src/vncconnection.c b/src/vncconnection.c
|
|
|
1c1f09 |
index 8cec1af..e5b43a0 100644
|
|
|
1c1f09 |
--- a/src/vncconnection.c
|
|
|
1c1f09 |
+++ b/src/vncconnection.c
|
|
|
1c1f09 |
@@ -5428,7 +5428,7 @@ static gboolean vnc_connection_open_addr_internal(VncConnection *conn)
|
|
|
1c1f09 |
return TRUE;
|
|
|
1c1f09 |
}
|
|
|
1c1f09 |
vnc_connection_set_error(conn, "Unable to connect: %s",
|
|
|
1c1f09 |
- conn_error ? conn_error->message : "");
|
|
|
1c1f09 |
+ conn_error ? conn_error->message : "Unknown problem");
|
|
|
1c1f09 |
g_clear_error(&conn_error);
|
|
|
1c1f09 |
return FALSE;
|
|
|
1c1f09 |
}
|
|
|
1c1f09 |
@@ -5466,8 +5466,9 @@ static gboolean vnc_connection_open_host_internal(VncConnection *conn)
|
|
|
1c1f09 |
}
|
|
|
1c1f09 |
g_object_unref(enumerator);
|
|
|
1c1f09 |
if (!sock) {
|
|
|
1c1f09 |
- vnc_connection_set_error(conn, "Unable to connect: %s",
|
|
|
1c1f09 |
- conn_error->message);
|
|
|
1c1f09 |
+ vnc_connection_set_error(conn, "Unable to connect to %s:%s: %s",
|
|
|
1c1f09 |
+ priv->host, priv->port,
|
|
|
1c1f09 |
+ conn_error ? conn_error->message : "Unknown problem");
|
|
|
1c1f09 |
}
|
|
|
1c1f09 |
g_clear_error(&conn_error);
|
|
|
1c1f09 |
if (sock) {
|