circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-25 06:08:53 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 808:

Browse Source 
server_kill_window can modify the RB tree so don't use RB_FOREACH, fixes
crash seen by Dan Harnett.
This commit is contained in:
Tiago Cunha 2010-12-25 23:44:37 +00:00
parent 3585feca54
commit 3cd9ea1789
1 changed files with 7 additions and 3 deletions

10
server-fn.c
View File

@ -1,4 +1,4 @@
/* $Id: server-fn.c,v 1.116 2010-12-22 15:36:44 tcunha Exp $ */ /* $Id: server-fn.c,v 1.117 2010-12-25 23:44:37 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -239,10 +239,14 @@ server_lock_client(struct client *c)
void void
server_kill_window(struct window *w) server_kill_window(struct window *w)
{ {
struct session *s; struct session *s, *next_s;
struct winlink *wl; 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) if (session_has(s, w) == NULL)
continue; continue;
while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) { while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) {