mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Sync OpenBSD patchset 808:
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:
		
							
								
								
									
										10
									
								
								server-fn.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								server-fn.c
									
									
									
									
									
								
							@@ -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>
 | 
			
		||||
@@ -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) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user