From b7fc42e03a7f52efb8707fabbab841d8b2ffff8c Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 14 Jan 2014 14:26:37 -0500 Subject: 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 :) --- src/libsystemd/sd-bus.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/libsystemd/sd-bus.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; } -- cgit v1.2.3-54-g00ecf