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

don't call wxSocketImpl::ReenableEvents() if the socket was closed while reading/writing to avoid an assert in it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-03 14:28:02 +00:00
parent 8a28bf768c
commit f46a01651a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/socket.cpp
View File

@@ -213,7 +213,11 @@ public:
{
m_socket->m_reading = false;
m_socket->m_impl->ReenableEvents(wxSOCKET_INPUT_FLAG);
// connection could have been lost while reading, in this case calling
// ReenableEvents() would assert and is not necessary anyhow
wxSocketImpl * const impl = m_socket->m_impl;
if ( impl && impl->m_fd != INVALID_SOCKET )
impl->ReenableEvents(wxSOCKET_INPUT_FLAG);
}
private:
@@ -231,13 +235,15 @@ public:
wxASSERT_MSG( !m_socket->m_writing, "write reentrancy?" );
m_socket->m_writing = true;
m_socket->m_impl->ReenableEvents(wxSOCKET_OUTPUT_FLAG);
}
~wxSocketWriteGuard()
{
m_socket->m_writing = false;
wxSocketImpl * const impl = m_socket->m_impl;
if ( impl && impl->m_fd != INVALID_SOCKET )
impl->ReenableEvents(wxSOCKET_OUTPUT_FLAG);
}
private: