From 1b64f8382956cdd9a2afc50a7ab638529acb912e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 15 May 2014 17:08:24 +0200 Subject: sd-bus: always keep slot reference while dispatching callback Also, make sure we automatically destroy reply callbacks that are floating. --- src/libsystemd/sd-bus/bus-match.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libsystemd/sd-bus/bus-match.c') diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c index b868159b5c..3391b1a1b6 100644 --- a/src/libsystemd/sd-bus/bus-match.c +++ b/src/libsystemd/sd-bus/bus-match.c @@ -290,16 +290,15 @@ int bus_match_run( /* Run the callback. And then invoke siblings. */ if (node->leaf.callback) { - sd_bus_slot *slot; - _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; + sd_bus_slot *slot; slot = container_of(node->leaf.callback, sd_bus_slot, match_callback); if (bus) - bus->current_slot = slot; + bus->current_slot = sd_bus_slot_ref(slot); r = node->leaf.callback->callback(bus, m, slot->userdata, &error_buffer); if (bus) - bus->current_slot = NULL; + bus->current_slot = sd_bus_slot_unref(slot); r = bus_maybe_reply_error(m, r, &error_buffer); if (r != 0) -- cgit v1.2.3-54-g00ecf