Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid closing invalid socket after unsuccessful Accept()

Browse Source 
Calling wxSocket::Accept() may return an invalid socket, especially when
non-blocking, so don't close it unconditionally.

This avoids an assertion failure in MSVC CRT due to calling
closesocket() with an invalid argument.
This commit is contained in:
Vadim Zeitlin
2019-10-27 15:50:33 +01:00
parent 56d36d11ba
commit 1d844882ed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/socket.cpp
View File

@@ -529,8 +529,6 @@ wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket)
WX_SOCKLEN_T fromlen = sizeof(from); WX_SOCKLEN_T fromlen = sizeof(from);
const wxSOCKET_T fd = accept(m_fd, &from.addr, &fromlen); const wxSOCKET_T fd = accept(m_fd, &from.addr, &fromlen);
wxScopeGuard closeSocket = wxMakeGuard(wxCloseSocket, fd);
// accepting is similar to reading in the sense that it resets "ready for // accepting is similar to reading in the sense that it resets "ready for
// read" flag on the socket // read" flag on the socket
ReenableEvents(wxSOCKET_INPUT_FLAG); ReenableEvents(wxSOCKET_INPUT_FLAG);
@@ -538,6 +536,8 @@ wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket)
if ( fd == INVALID_SOCKET ) if ( fd == INVALID_SOCKET )
return NULL; return NULL;
wxScopeGuard closeSocket = wxMakeGuard(wxCloseSocket, fd);
wxSocketManager * const manager = wxSocketManager::Get(); wxSocketManager * const manager = wxSocketManager::Get();
if ( !manager ) if ( !manager )
return NULL; return NULL;