33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
|
From c2b8fa8a34765d42be69e7eb9a4c44eeb970f775 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Catanzaro <mcatanzaro@gnome.org>
|
||
|
|
Date: Wed, 28 Oct 2020 10:41:13 -0500
|
||
|
|
Subject: [PATCH] gsocketclient: fix crash when async connection step fails
|
||
|
|
|
||
|
|
This is a regression from !1686. The tmp_error is no longer valid after
|
||
|
|
it is "considered" and cannot be used at this point. We should print the
|
||
|
|
error earlier instead.
|
||
|
|
|
||
|
|
Fixes #2233
|
||
|
|
---
|
||
|
|
gio/gsocketclient.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
|
||
|
|
index ce3c186fb..373774682 100644
|
||
|
|
--- a/gio/gsocketclient.c
|
||
|
|
+++ b/gio/gsocketclient.c
|
||
|
|
@@ -1837,9 +1837,9 @@ g_socket_client_connected_callback (GObject *source,
|
||
|
|
{
|
||
|
|
if (!g_cancellable_is_cancelled (attempt->cancellable))
|
||
|
|
{
|
||
|
|
+ g_debug ("GSocketClient: Connection attempt failed: %s", data->error_info->tmp_error->message);
|
||
|
|
clarify_connect_error (data->error_info->tmp_error, data->connectable, attempt->address);
|
||
|
|
consider_tmp_error (data->error_info, G_SOCKET_CLIENT_CONNECTING);
|
||
|
|
- g_debug ("GSocketClient: Connection attempt failed: %s", data->error_info->tmp_error->message);
|
||
|
|
connection_attempt_remove (attempt);
|
||
|
|
connection_attempt_unref (attempt);
|
||
|
|
try_next_connection_or_finish (data, FALSE);
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|