[glib/wip/tingping/socket-client-slow-fix: 1/2] gsocketclient: Fix critical on cancellation

[Patrick Griffis <pgriffis src gnome org>]

commit 743881f5772238e1de615674ef60b95bfd641c95
Author: Patrick Griffis <pgriffis igalia com>
Date:   Thu Feb 21 15:31:52 2019 -0500

    gsocketclient: Fix critical on cancellation
    
    We need to be more explicit in handling cancellation to avoid
    multiple task returns.
    
    Fixes #1693

 gio/gsocketclient.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index 11e92e909..f289f8be5 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -1424,9 +1424,15 @@ g_socket_client_async_connect_complete (GSocketClientAsyncConnectData *data)
       data->connection = (GIOStream *)wrapper_connection;
     }
 
-  g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, data->connection);
-  g_task_return_pointer (data->task, data->connection, g_object_unref);
-  data->connection = NULL;
+  if (!g_task_return_error_if_cancelled (data->task))
+    {
+      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, 
data->connection);
+      g_task_return_pointer (data->task, g_steal_pointer (&data->connection), g_object_unref);
+    }
+  else
+    g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, NULL);
+
+  g_clear_object (&data->connection);
   g_object_unref (data->task);
 }
 
@@ -1547,10 +1553,18 @@ g_socket_client_proxy_connect_callback (GObject      *object,
 static gboolean
 task_completed_or_cancelled (GTask *task)
 {
+  GCancellable *cancellable = g_task_get_cancellable (task);
+  GError *error = NULL;
+
   if (g_task_get_completed (task))
     return TRUE;
-  else if (g_task_return_error_if_cancelled (task))
+  else if (cancellable && g_cancellable_set_error_if_cancelled (cancellable, &error))
+    {
+      if (!g_task_had_error (task))
+        g_task_return_error (task, g_steal_pointer (&error));
+      g_clear_error (&error);
       return TRUE;
+    }
   else
     return FALSE;
 }
@@ -1835,6 +1849,7 @@ g_socket_client_connect_async (GSocketClient       *client,
    */
 
   data->task = g_task_new (client, cancellable, callback, user_data);
+  g_task_set_check_cancellable (data->task, FALSE); /* We handle this manually */
   g_task_set_source_tag (data->task, g_socket_client_connect_async);
   g_task_set_task_data (data->task, data, (GDestroyNotify)g_socket_client_async_connect_data_free);