Blame SOURCES/0004-Fix-crash-when-opening-connection-from-a-GSocketAddr.patch
|
 |
bf78cb |
From 605811dbb15450037befa3e3b120f737f4625752 Mon Sep 17 00:00:00 2001
|
|
|
bf78cb |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
bf78cb |
Date: Thu, 6 Apr 2017 17:24:50 +0100
|
|
|
bf78cb |
Subject: [PATCH] Fix crash when opening connection from a GSocketAddress
|
|
|
bf78cb |
|
|
|
bf78cb |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
bf78cb |
(cherry picked from commit 5368f77d6215d7b6ad1422dff284d288a26ff481)
|
|
|
bf78cb |
---
|
|
|
bf78cb |
src/vncconnection.c | 6 +++---
|
|
|
bf78cb |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
bf78cb |
|
|
|
bf78cb |
diff --git a/src/vncconnection.c b/src/vncconnection.c
|
|
|
bf78cb |
index c55f71d..8cec1af 100644
|
|
|
bf78cb |
--- a/src/vncconnection.c
|
|
|
bf78cb |
+++ b/src/vncconnection.c
|
|
|
bf78cb |
@@ -5423,13 +5423,13 @@ static gboolean vnc_connection_open_addr_internal(VncConnection *conn)
|
|
|
bf78cb |
VNC_DEBUG("Connecting with addr %p", priv->addr);
|
|
|
bf78cb |
|
|
|
bf78cb |
sock = vnc_connection_connect_socket(&priv->wait, priv->addr, &conn_error);
|
|
|
bf78cb |
- vnc_connection_set_error(conn, "Unable to connect: %s",
|
|
|
bf78cb |
- conn_error->message);
|
|
|
bf78cb |
- g_clear_error(&conn_error);
|
|
|
bf78cb |
if (sock) {
|
|
|
bf78cb |
priv->sock = sock;
|
|
|
bf78cb |
return TRUE;
|
|
|
bf78cb |
}
|
|
|
bf78cb |
+ vnc_connection_set_error(conn, "Unable to connect: %s",
|
|
|
bf78cb |
+ conn_error ? conn_error->message : "");
|
|
|
bf78cb |
+ g_clear_error(&conn_error);
|
|
|
bf78cb |
return FALSE;
|
|
|
bf78cb |
}
|
|
|
bf78cb |
|