From e23df3af5a57d28ba40b14db1ad6d62f0ee99940 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 29 Jan 2012 12:53:33 +0000 Subject: Sync OpenBSD patchset 1014: Call bufferevent_free before closing file descriptor associated with it or bugs in $EventMechanism on $OtherOS makes libevent get it's knickers in a twist. From Dylan Alex Simon. --- window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index 97337207..111eb9c1 100644 --- a/window.c +++ b/window.c @@ -608,8 +608,8 @@ window_pane_destroy(struct window_pane *wp) window_pane_reset_mode(wp); if (wp->fd != -1) { - close(wp->fd); bufferevent_free(wp->event); + close(wp->fd); } input_free(wp); @@ -619,8 +619,8 @@ window_pane_destroy(struct window_pane *wp) grid_destroy(wp->saved_grid); if (wp->pipe_fd != -1) { - close(wp->pipe_fd); bufferevent_free(wp->pipe_event); + close(wp->pipe_fd); } RB_REMOVE(window_pane_tree, &all_window_panes, wp); @@ -644,8 +644,8 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell, struct termios tio2; if (wp->fd != -1) { - close(wp->fd); bufferevent_free(wp->event); + close(wp->fd); } if (cmd != NULL) { if (wp->cmd != NULL) -- cgit