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_epoll.cpp | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 934106e54..2e32d5da9 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -233,6 +233,9 @@ int EPollEngine::DispatchEvents()
 		{
 			ReadEvents++;
 			eh->HandleEvent(EVENT_READ);
+			if (eh != ref[events[j].data.fd])
+				// whoops, deleted out from under us
+				continue;
 		}
 		if (events[j].events & EPOLLOUT)
 		{
-- 
cgit v1.3.1-10-gc9f91