diff options
author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-03-02 01:48:06 +0000 |
---|---|---|
committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-03-02 01:48:06 +0000 |
commit | 5af0e15f15f0b09643dcdf6da3d9eb2349d16422 (patch) | |
tree | c714d992179e35a300cefd4f9fff8b3a352cc32e /src/socketengines/socketengine_poll.cpp | |
parent | 2561ede5059f0e3340466a302b404efd2381c77f (diff) |
Don't send events for removed FDs when both read and write are ready
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12582 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/socketengines/socketengine_poll.cpp')
-rw-r--r-- | src/socketengines/socketengine_poll.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
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) |