From f0c05d3d1c37fd2f5cc8f21cb7dd1d6ecdf48f22 Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Mon, 1 Mar 2010 19:47:17 -0600
Subject: Don't send events for removed FDs when both read and write are ready

---
 src/socketengines/socketengine_poll.cpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/socketengines/socketengine_poll.cpp')

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 93463aea7..a1e0b815a 100644
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -13,18 +13,6 @@
 
 #include "inspircd.h"
 #include "exitcodes.h"
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
- *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- * ---------------------------------------------------
- */
 
 #ifndef __SOCKETENGINE_POLL__
 #define __SOCKETENGINE_POLL__
@@ -269,6 +257,9 @@ int PollEngine::DispatchEvents()
 			{
 				SetEventMask(eh, eh->GetEventMask() & ~FD_READ_WILL_BLOCK);
 				eh->HandleEvent(EVENT_READ);
+				if (eh != ref[index])
+					// whoops, deleted out from under us
+					continue;
 			}
 			
 			if (events[index].revents & POLLOUT)
-- 
cgit v1.3.1-10-gc9f91