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 17:52:00 +0200
commitc2c5062f8bcda25b961e593dc26270290f98e661 (patch)
tree955c69af50a90cf96c797951d270cc054a9d1fa5
parent12bef89cc02454ce66af944f2582c26955e9def0 (diff)
downloadsystemd-c2c5062f8bcda25b961e593dc26270290f98e661.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) (cherry picked from commit a93ddddd00860bda05df72cfd5b80be9b3a93023)
-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 0d7740f1a4..e8b59db5ec 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -4152,7 +4152,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);