diff options
| -rw-r--r-- | src/socketengine.cpp | 14 | ||||
| -rw-r--r-- | src/socketengine_iocp.cpp | 13 |
2 files changed, 7 insertions, 20 deletions
diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 3aef464e6..28ba8c252 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -93,24 +93,10 @@ std::string SocketEngine::GetName() bool SocketEngine::BoundsCheckFd(EventHandler* eh) { -#ifdef WINDOWS - int * internal_fd; - if(!eh || eh->GetFd() < 0) - return false; - - if(!eh->GetExt("internal_fd", internal_fd)) - return false; - - if(*internal_fd > MAX_DESCRIPTORS) - return false; - - return true; -#else if (!eh) return false; if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS)) return false; return true; -#endif } diff --git a/src/socketengine_iocp.cpp b/src/socketengine_iocp.cpp index 3581904ed..4eb9f83cd 100644 --- a/src/socketengine_iocp.cpp +++ b/src/socketengine_iocp.cpp @@ -456,15 +456,16 @@ bool IOCPEngine::HasFd(int fd) bool IOCPEngine::BoundsCheckFd(EventHandler* eh) { - int* fake_fd = NULL; - if (!eh) - return false; - if (!eh->GetExt("internal_fd", fake_fd)) + int * internal_fd; + if (!eh || eh->GetFd() < 0) return false; - if ((*fake_fd < 0) || (*fake_fd > MAX_DESCRIPTORS)) + + if(!eh->GetExt("internal_fd", internal_fd)) return false; - if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS)) + + if(*internal_fd > MAX_DESCRIPTORS) return false; + return true; } |