From d3d25365f17b2e7c4244a345a39e8c48f067858a Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Thu, 23 Dec 2010 21:56:38 +0000
Subject: server_kill_window can modify the RB tree so don't use RB_FOREACH,
 fixes crash seen by Dan Harnett.

---
 server-fn.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'server-fn.c')

diff --git a/server-fn.c b/server-fn.c
index ada92b9a..03fa01d2 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -239,10 +239,14 @@ server_lock_client(struct client *c)
 void
 server_kill_window(struct window *w)
 {
-	struct session	*s;
+	struct session	*s, *next_s;
 	struct winlink	*wl;
 
-	RB_FOREACH(s, sessions, &sessions) {
+	next_s = RB_MIN(sessions, &sessions);
+	while (next_s != NULL) {
+		s = next_s;
+		next_s = RB_NEXT(sessions, &sessions, s);
+
 		if (session_has(s, w) == NULL)
 			continue;
 		while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) {
-- 
cgit v1.2.3