Added some missing parameter checking in m_swhois

[user/henk/code/inspircd.git] / src / socketengine_ports.cpp

diff --git a/src/socketengine_ports.cpp b/src/socketengine_ports.cpp
index f036a8e10ef1c03c4196ce6088148ca05c881e2e..869e0a6fb3876b8f406c170f4e4d21f1df2ce517 100644 (file)
--- a/src/socketengine_ports.cpp
+++ b/src/socketengine_ports.cpp
@@ -13,7 +13,7 @@
 
 #include "inspircd.h"
 #include "exitcodes.h"
-#include <sys/epoll.h>
+#include <port.h>
 #include "socketengine_ports.h"
 
 PortsEngine::PortsEngine(InspIRCd* Instance) : SocketEngine(Instance)
@@ -104,10 +104,17 @@ int PortsEngine::DispatchEvents()
        {
                switch (this->events[i].portev_source)
                {
-               case PORT_SOURCE_FD:
-                       int fd = this->events[i].portev_object;
-                       ref[fd]->HandleEvent((this->events[i].portev_events & POLLRDNORM) ? EVENT_READ : EVENT_WRITE);
-               default:
+                       case PORT_SOURCE_FD:
+                       {
+                               int fd = this->events[i].portev_object;
+                               if (ref[fd])
+                               {
+                                       // reinsert port for next time around
+                                       port_associate(EngineHandle, PORT_SOURCE_FD, fd, POLLRDNORM, ref[fd]);
+                                       ref[fd]->HandleEvent((this->events[i].portev_events & POLLRDNORM) ? EVENT_READ : EVENT_WRITE);
+                               }
+                       }
+                       default:
                        break;
                }
        }