From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 Apr 2025 12:57:23 +0000 (+0200)
Subject: journal-remote: destroy event sources before MHD context
X-Git-Tag: v258-rc1~633^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f77c31f63388f87ce44ba81da4a09805fe00182;p=thirdparty%2Fsystemd.git

journal-remote: destroy event sources before MHD context

The MHD context owns the fd we watch via our event source, hence when we
destroy the context before the event source the event source might still
reference the fd that is now invalid. Hence swap the order.
---

diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 3dd72ddcf47..e5ede19e03f 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -98,10 +98,11 @@ static MHDDaemonWrapper* MHDDaemonWrapper_free(MHDDaemonWrapper *d) {
         if (!d)
                 return NULL;
 
+        d->io_event = sd_event_source_unref(d->io_event);
+        d->timer_event = sd_event_source_unref(d->timer_event);
+
         if (d->daemon)
                 MHD_stop_daemon(d->daemon);
-        sd_event_source_unref(d->io_event);
-        sd_event_source_unref(d->timer_event);
 
         return mfree(d);
 }