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.

1 files changed, 6 insertions, 6 deletions

diff --git a/server-client.c b/server-client.c
index 61b864b7..6d485ae1 100644
--- a/server-client.c
+++ b/server-client.c
@@ -123,24 +123,24 @@ server_client_lost(struct client *c)
 	if (c->flags & CLIENT_TERMINAL)
 		tty_free(&c->tty);
 
+	if (c->stdin_event != NULL)
+		bufferevent_free(c->stdin_event);
 	if (c->stdin_fd != -1) {
 		setblocking(c->stdin_fd, 1);
 		close(c->stdin_fd);
 	}
-	if (c->stdin_event != NULL)
-		bufferevent_free(c->stdin_event);
+	if (c->stdout_event != NULL)
+		bufferevent_free(c->stdout_event);
 	if (c->stdout_fd != -1) {
 		setblocking(c->stdout_fd, 1);
 		close(c->stdout_fd);
 	}
-	if (c->stdout_event != NULL)
-		bufferevent_free(c->stdout_event);
+	if (c->stderr_event != NULL)
+		bufferevent_free(c->stderr_event);
 	if (c->stderr_fd != -1) {
 		setblocking(c->stderr_fd, 1);
 		close(c->stderr_fd);
 	}
-	if (c->stderr_event != NULL)
-		bufferevent_free(c->stderr_event);
 
 	status_free_jobs(&c->status_new);
 	status_free_jobs(&c->status_old);