From 34b4c2e607a0672415f5ad7600ede0e57166672e Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 8 Nov 2009 23:35:53 +0000 Subject: [PATCH] Sync OpenBSD patchset 517: Don't try enable/disable the event if the window pane is dead (fd == -1), as the event will have been freed. --- server-window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server-window.c b/server-window.c index 88ba0ec8..3ebf2034 100644 --- a/server-window.c +++ b/server-window.c @@ -1,4 +1,4 @@ -/* $Id: server-window.c,v 1.10 2009-11-08 23:22:24 tcunha Exp $ */ +/* $Id: server-window.c,v 1.11 2009-11-08 23:35:53 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -70,10 +70,12 @@ server_window_loop(void) continue; TAILQ_FOREACH(wp, &w->panes, entry) { - if (server_window_backoff(wp)) - bufferevent_disable(wp->event, EV_READ); - else - bufferevent_enable(wp->event, EV_READ); + if (wp->fd != -1) { + if (server_window_backoff(wp)) + bufferevent_disable(wp->event, EV_READ); + else + bufferevent_enable(wp->event, EV_READ); + } } for (j = 0; j < ARRAY_LENGTH(&sessions); j++) {