From c9c6a8f2ba8b57a55d7162264d0e55b39f608cbd Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Fri, 9 Oct 2026 10:16:02 +0000
Subject: [PATCH] Clear session when freeing client, GitHub issue 5712 from
 Jeong, Heon.

---
 server-client.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server-client.c b/server-client.c
index 62b2bdb02..214ebe561 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.518 2026/10/06 10:55:55 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.519 2026/10/09 10:16:02 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -404,6 +404,9 @@ server_client_lost(struct client *c)
 	if (c->name != NULL && (c->flags & (CLIENT_CONTROL|CLIENT_TERMINAL)))
 		events_fire_client("client-closed", c);
 
+	c->session = NULL;
+	c->last_session = NULL;
+
 	if (c->flags & CLIENT_CONTROL)
 		control_stop(c);
 	if (c->flags & CLIENT_TERMINAL)