From e96d51424745d4a4a9574c39c3777e8c05311c22 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Wed, 30 May 2012 13:49:05 +0000
Subject: [PATCH] Sync OpenBSD patchset 1129:

Use RB_FOREACH_SAFE as winlinks are being removed, from Chris Johnsen.
---
 cmd-kill-window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd-kill-window.c b/cmd-kill-window.c
index abe7738e..ec2b1895 100644
--- a/cmd-kill-window.c
+++ b/cmd-kill-window.c
@@ -40,14 +40,14 @@ int
 cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
-	struct winlink	*wl, *wl2;
+	struct winlink	*wl, *wl2, *wl3;
 	struct session	*s;
 
 	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
 		return (-1);
 
 	if (args_has(args, 'a')) {
-		RB_FOREACH(wl2, winlinks, &s->windows) {
+		RB_FOREACH_SAFE(wl2, winlinks, &s->windows, wl3) {
 			if (wl != wl2)
 				server_kill_window(wl2->window);
 		}