From fb362115d5ea4e12f4e0c247f6160f243eb6757f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 21 Jul 2017 20:18:06 +0100 Subject: [PATCH] bus/containers: Each connection to a container holds a reference Signed-off-by: Simon McVittie --- Roll back a use of bus_clear_containers(), because we need to distinguish between NULL and non-NULL anyway https://bugs.freedesktop.org/show_bug.cgi?id=101354 --- bus/containers.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/bus/containers.c b/bus/containers.c index 8a14d2f6..9f90f577 100644 --- a/bus/containers.c +++ b/bus/containers.c @@ -71,12 +71,23 @@ struct BusContainers dbus_uint64_t next_container_id; }; +/* Data slot on DBusConnection, holding BusContainerInstance */ +static dbus_int32_t contained_data_slot = -1; + BusContainers * bus_containers_new (void) { /* We allocate the hash table lazily, expecting that the common case will * be a connection where this feature is never used */ - BusContainers *self = dbus_new0 (BusContainers, 1); + BusContainers *self = NULL; + + /* One reference per BusContainers, unless we ran out of memory the first + * time we tried to allocate it, in which case it will be -1 when we + * free the BusContainers */ + if (!dbus_connection_allocate_data_slot (&contained_data_slot)) + goto oom; + + self = dbus_new0 (BusContainers, 1); if (self == NULL) goto oom; @@ -121,7 +132,16 @@ bus_containers_new (void) return self; oom: - bus_clear_containers (&self); + if (self != NULL) + { + /* This will free the data slot too */ + bus_containers_unref (self); + } + else + { + if (contained_data_slot != -1) + dbus_connection_free_data_slot (&contained_data_slot); + } return NULL; } @@ -147,6 +167,9 @@ bus_containers_unref (BusContainers *self) _dbus_clear_hash_table (&self->instances_by_path); _dbus_string_free (&self->address_template); dbus_free (self); + + if (contained_data_slot != -1) + dbus_connection_free_data_slot (&contained_data_slot); } } @@ -309,6 +332,14 @@ new_connection_cb (DBusServer *server, { BusContainerInstance *instance = data; + if (!dbus_connection_set_data (new_connection, contained_data_slot, + bus_container_instance_ref (instance), + (DBusFreeFunction) bus_container_instance_unref)) + { + bus_container_instance_unref (instance); + return; + } + if (!bus_context_add_incoming_connection (instance->context, new_connection)) return; -- 2.13.3