X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgsocketclient.c;h=2cd98932fcf4832093f517b046766dd0a06ce2ec;hb=7fd6f07d498063470903a886b4805a13bd333908;hp=61c55ca323879659c2c16d8bcfe6654c4ff1c98f;hpb=d7b9f209904bcd5fdee9a902a1302c08a1ca9552;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index 61c55ca..2cd9893 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -1492,6 +1492,12 @@ g_socket_client_connected_callback (GObject      *source,
   GProxy *proxy;
   const gchar *protocol;
 
+  if (g_task_return_error_if_cancelled (data->task))
+    {
+      g_object_unref (data->task);
+      return;
+    }
+
   if (!g_socket_connection_connect_finish (G_SOCKET_CONNECTION (source),
 					   result, &error))
     {
@@ -1574,7 +1580,10 @@ g_socket_client_enumerator_callback (GObject      *object,
   GError *error = NULL;
 
   if (g_task_return_error_if_cancelled (data->task))
-    return;
+    {
+      g_object_unref (data->task);
+      return;
+    }
 
   address = g_socket_address_enumerator_next_finish (data->enumerator,
 						     result, &error);