diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/socket.cpp | 6 | ||||
| -rw-r--r-- | src/socketengine.cpp | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/socket.cpp b/src/socket.cpp index 508d638cf..23d760002 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -287,6 +287,9 @@ bool InspSocket::FlushWriteBuffer() bool InspSocket::Timeout(time_t current) { + if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) + return false; + if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end)) { log(DEBUG,"Timed out, current=%lu timeout_end=%lu"); @@ -305,6 +308,9 @@ bool InspSocket::Timeout(time_t current) bool InspSocket::Poll() { + if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) + return true; + int incoming = -1; bool n = true; diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 3df9c2135..bcc8e23af 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -112,6 +112,13 @@ bool SocketEngine::AddFd(int fd, bool readable, char type) return true; } +bool SocketEngine::HasFd(int fd) +{ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return false; + return (ref[fd] != 0); +} + bool SocketEngine::DelFd(int fd) { log(DEBUG,"SocketEngine::DelFd(%d)",fd); |