summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Sekletar <msekleta@redhat.com>2021-09-08 15:42:11 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-10-12 16:50:01 +0200
commita93ddddd00860bda05df72cfd5b80be9b3a93023 (patch)
tree4f6df29e6627a2efa3ae1948dcea6d591844c0a7
parentb5162039b2309b78a9c1feb6cc1355988e02b6c3 (diff)
downloadsystemd-a93ddddd00860bda05df72cfd5b80be9b3a93023.tar.gz
sd-event: take ref on event loop object before dispatching event sources
Idea is that all public APIs should take reference on objects that get exposed to user-provided callbacks. We take the reference as a protection from callbacks dropping it. We used to do this also here in sd_event_loop(). However, in cleanup portion of f814c871e6 this was accidentally dropped. (cherry picked from commit 9f6ef467818f902fe5369c8e37a39a3901bdcf4f)
-rw-r--r--src/libsystemd/sd-event/sd-event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index e9199deb41..99c0acfa54 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -4154,7 +4154,7 @@ _public_ int sd_event_loop(sd_event *e) {
assert_return(!event_pid_changed(e), -ECHILD);
assert_return(e->state == SD_EVENT_INITIAL, -EBUSY);
- _unused_ _cleanup_(sd_event_unrefp) sd_event *ref = NULL;
+ _unused_ _cleanup_(sd_event_unrefp) sd_event *ref = sd_event_ref(e);
while (e->state != SD_EVENT_FINISHED) {
r = sd_event_run(e, UINT64_MAX);