mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-11 11:56:16 +01:00
Merge branch 'mcatanzaro/#2233' into 'master'
gsocketclient: fix crash when async connection step fails Closes #2233 See merge request GNOME/glib!1728
This commit is contained in:
commit
b04a359d1e
@ -1837,9 +1837,9 @@ g_socket_client_connected_callback (GObject *source,
|
|||||||
{
|
{
|
||||||
if (!g_cancellable_is_cancelled (attempt->cancellable))
|
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);
|
clarify_connect_error (data->error_info->tmp_error, data->connectable, attempt->address);
|
||||||
consider_tmp_error (data->error_info, G_SOCKET_CLIENT_CONNECTING);
|
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_remove (attempt);
|
||||||
connection_attempt_unref (attempt);
|
connection_attempt_unref (attempt);
|
||||||
try_next_connection_or_finish (data, FALSE);
|
try_next_connection_or_finish (data, FALSE);
|
||||||
|
Loading…
Reference in New Issue
Block a user