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

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

diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 63a877238..6f329357d 100644
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -230,6 +230,10 @@ int KQueueEngine::DispatchEvents()
 			const int bits_to_clr = FD_WANT_SINGLE_WRITE | FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
 			SetEventMask(eh, eh->GetEventMask() & ~bits_to_clr);
 			eh->HandleEvent(EVENT_WRITE);
+
+			if (eh != ref[ke_list[j].ident];
+				// whoops, deleted out from under us
+				continue;
 		}
 		if (ke_list[j].filter == EVFILT_READ)
 		{
-- 
cgit v1.3.1-10-gc9f91