From 876ded6dfe560277d7771ba5a14964700ca8ad2a Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Wed, 28 Oct 2009 23:06:41 +0000
Subject: [PATCH] Sync OpenBSD patchset 462:

Don't do anything in the client callback if the client has already died to
avoid a use-after-free (the callback is used twice, once for the client itself
and once for the tty). Fixes crashes seen by Han Boetes.
---
 server-client.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server-client.c b/server-client.c
index 0d10eb4b..dcfa7d4f 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $Id: server-client.c,v 1.7 2009-10-28 22:50:24 tcunha Exp $ */
+/* $Id: server-client.c,v 1.8 2009-10-28 23:06:41 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -152,6 +152,9 @@ server_client_callback(int fd, int events, void *data)
 {
 	struct client	*c = data;
 
+	if (c->flags & CLIENT_DEAD)
+		return;
+
 	if (fd == c->ibuf.fd) {
 		if (events & (POLLERR|POLLNVAL|POLLHUP))
 			goto client_lost;