From 5de077a604c4d4a6a8b042b87ea51fa0e4b21485 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 16 Dec 2012 01:16:28 +0100 Subject: gdbus: Fix race condition with creating duplicate client proxies --- gdbus/client.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gdbus/client.c') diff --git a/gdbus/client.c b/gdbus/client.c index 76e4cc17..d7d9e361 100644 --- a/gdbus/client.c +++ b/gdbus/client.c @@ -196,6 +196,23 @@ static void prop_entry_free(gpointer data) g_free(prop); } +static GDBusProxy *proxy_lookup(GDBusClient *client, const char *path, + const char *interface) +{ + GList *list; + + for (list = g_list_first(client->proxy_list); list; + list = g_list_next(list)) { + GDBusProxy *proxy = list->data; + + if (g_str_equal(proxy->interface, interface) == TRUE && + g_str_equal(proxy->obj_path, path) == TRUE) + return proxy; + } + + return NULL; +} + static GDBusProxy *proxy_new(GDBusClient *client, const char *path, const char *interface) { @@ -621,6 +638,12 @@ static void parse_properties(GDBusClient *client, const char *path, if (g_str_equal(interface, DBUS_INTERFACE_PROPERTIES) == TRUE) return; + proxy = proxy_lookup(client, path, interface); + if (proxy) { + update_properties(proxy, iter); + return; + } + proxy = proxy_new(client, path, interface); if (proxy == NULL) return; -- cgit v1.2.3