From: Michal Sekletar <msekleta@redhat.com>
Date: Wed, 8 Sep 2021 13:42:11 +0000 (+0200)
Subject: sd-event: take ref on event loop object before dispatching event sources
X-Git-Tag: v250-rc1~711
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f6ef467818f902fe5369c8e37a39a3901bdcf4f;p=thirdparty%2Fsystemd.git

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

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index cb8f54b1d52..b06e00fae27 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);