X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fbus-match.c;fp=src%2Flibsystemd%2Fsd-bus%2Fbus-match.c;h=3391b1a1b6e47671488aecff34fc8db57e3fe94f;hb=1b64f8382956cdd9a2afc50a7ab638529acb912e;hp=b868159b5c8233fd49e30650d3d74fe15f40e306;hpb=4a134c4903dbf6ef6c6ad55780643a5dd816d349;p=elogind.git diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c index b868159b5..3391b1a1b 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)