shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

bus: break reference cycle between bus and messages

Browse Source 
Previously (6ee4f99 bus: break reference cycle between bus and
messages) I committed the test code, but not the actual fix :)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-01-14 14:26:37 -05:00
parent 8114dedc59
commit b7fc42e03a
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -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

17
src/libsystemd/sd-bus.c
View File

@ -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;
}