OSDN Git Service

gdbus: Fix issue with unref of client in connect handler
authorMarcel Holtmann <marcel@holtmann.org>
Sat, 15 Dec 2012 22:34:51 +0000 (23:34 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Sat, 15 Dec 2012 22:34:51 +0000 (23:34 +0100)
gdbus/client.c

index 750242c..670f6a7 100644 (file)
@@ -757,6 +757,8 @@ done:
 
        dbus_pending_call_unref(client->pending_call);
        client->pending_call = NULL;
+
+       g_dbus_client_unref(client);
 }
 
 static void get_managed_objects(GDBusClient *client)
@@ -777,6 +779,8 @@ static void get_managed_objects(GDBusClient *client)
                return;
        }
 
+       g_dbus_client_ref(client);
+
        dbus_pending_call_set_notify(client->pending_call,
                                get_managed_objects_reply, client, NULL);
 
@@ -804,6 +808,8 @@ static void get_name_owner_reply(DBusPendingCall *call, void *user_data)
        g_free(client->unique_name);
        client->unique_name = g_strdup(name);
 
+       g_dbus_client_ref(client);
+
        if (client->connect_func)
                client->connect_func(client->dbus_conn, client->connect_data);
 
@@ -814,6 +820,8 @@ done:
        client->pending_call = NULL;
 
        get_managed_objects(client);
+
+       g_dbus_client_unref(client);
 }
 
 static void get_name_owner(GDBusClient *client, const char *name)