From 881bec958e2fd9093ed2c8fd8f934196f6afa7da Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 9 Mar 2026 14:33:55 +0000
Subject: [PATCH] Fix server crash when control client session is destroyed,
 from Renaud Allard in GitHub issue 4916.

---
 control.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/control.c b/control.c
index 05fed7c0..00544aa1 100644
--- a/control.c
+++ b/control.c
@@ -1046,6 +1046,9 @@ control_check_subs_timer(__unused int fd, __unused short events, void *data)
 	log_debug("%s: timer fired", __func__);
 	evtimer_add(&cs->subs_timer, &tv);
 
+	if (s == NULL)
+		return;
+
 	/* Find which subscription types are present. */
 	RB_FOREACH(csub, control_subs, &cs->subs) {
 		switch (csub->type) {