summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-01-14 14:26:37 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-01-16 00:16:02 -0500
commitb7fc42e03a7f52efb8707fabbab841d8b2ffff8c (patch)
tree54445583e995b291d21e7d731ebfbb9cd91600b1
parent8114dedc5910d9a9cec702f6b6658551a0cd9ede (diff)
bus: break reference cycle between bus and messages
Previously (6ee4f99 bus: break reference cycle between bus and messages) I committed the test code, but not the actual fix :)
-rw-r--r--Makefile.am10
-rw-r--r--src/libsystemd/sd-bus.c17
2 files changed, 25 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 4fc909787d..677de0cf0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2096,6 +2096,7 @@ tests += \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
+ test-bus-cleanup \
test-bus-server \
test-bus-match \
test-bus-kernel \
@@ -2157,6 +2158,15 @@ test_bus_chat_LDADD = \
libsystemd-daemon-internal.la \
libsystemd-shared.la
+test_bus_cleanup_SOURCES = \
+ src/libsystemd/test-bus-cleanup.c
+
+test_bus_cleanup_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
+
test_bus_server_SOURCES = \
src/libsystemd/test-bus-server.c
diff --git a/src/libsystemd/sd-bus.c b/src/libsystemd/sd-bus.c
index 6bd1eaa81b..b76221ef9a 100644
--- a/src/libsystemd/sd-bus.c
+++ b/src/libsystemd/sd-bus.c
@@ -1259,12 +1259,25 @@ _public_ sd_bus *sd_bus_ref(sd_bus *bus) {
}
_public_ sd_bus *sd_bus_unref(sd_bus *bus) {
+ unsigned i;
if (!bus)
return NULL;
- if (REFCNT_DEC(bus->n_ref) <= 0)
- bus_free(bus);
+ i = REFCNT_DEC(bus->n_ref);
+ if (i != bus->rqueue_size + bus->wqueue_size)
+ return NULL;
+
+ for (i = 0; i < bus->rqueue_size; i++)
+ if (bus->rqueue[i]->n_ref > 1)
+ return NULL;
+
+ for (i = 0; i < bus->wqueue_size; i++)
+ if (bus->wqueue[i]->n_ref > 1)
+ return NULL;
+
+ /* we are the only holders on the messages */
+ bus_free(bus);
return NULL;
}