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

don't call OnWriteWaiting() if we lost connection in OnReadWaiting() called just before it (closes #10963)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-05 21:42:56 +00:00
parent 37465b7281
commit ee0995b09b
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/unix/private/sockunix.h
View File

@@ -204,7 +204,7 @@ public:
private:
// these functions map directly to XtAdd/RemoveInput() or
// gdk_input_add/remove()
virtual int AddInput(wxSocketImpl *handler, int fd, SocketDir d) = 0;
virtual int AddInput(wxSocketImplUnix *handler, int fd, SocketDir d) = 0;
virtual void RemoveInput(int fd) = 0;
};

13
src/gtk/sockgtk.cpp
View File

@@ -28,10 +28,19 @@ void wxSocket_GDK_Input(gpointer data,
gint WXUNUSED(source),
GdkInputCondition condition)
{
wxSocketImpl * const handler = static_cast<wxSocketImpl *>(data);
wxSocketImplUnix * const handler = static_cast<wxSocketImplUnix *>(data);
if ( condition & GDK_INPUT_READ )
{
handler->OnReadWaiting();
// we could have lost connection while reading in which case we
// shouldn't call OnWriteWaiting() as the socket is now closed and it
// would assert
if ( handler->m_fd == INVALID_SOCKET )
return;
}
if ( condition & GDK_INPUT_WRITE )
handler->OnWriteWaiting();
}
@@ -40,7 +49,7 @@ void wxSocket_GDK_Input(gpointer data,
class GTKSocketManager : public wxSocketInputBasedManager
{
public:
virtual int AddInput(wxSocketImpl *handler, int fd, SocketDir d)
virtual int AddInput(wxSocketImplUnix *handler, int fd, SocketDir d)
{
return gdk_input_add
(

13
src/gtk1/sockgtk.cpp
View File

@@ -28,10 +28,19 @@ void wxSocket_GDK_Input(gpointer data,
gint WXUNUSED(source),
GdkInputCondition condition)
{
wxSocketImpl * const handler = static_cast<wxSocketImpl *>(data);
wxSocketImplUnix * const handler = static_cast<wxSocketImplUnix *>(data);
if ( condition & GDK_INPUT_READ )
{
handler->OnReadWaiting();
// we could have lost connection while reading in which case we
// shouldn't call OnWriteWaiting() as the socket is now closed and it
// would assert
if ( handler->m_fd == INVALID_SOCKET )
return;
}
if ( condition & GDK_INPUT_WRITE )
handler->OnWriteWaiting();
}
@@ -40,7 +49,7 @@ void wxSocket_GDK_Input(gpointer data,
class GTKSocketManager : public wxSocketInputBasedManager
{
public:
virtual int AddInput(wxSocketImpl *handler, int fd, SocketDir d)
virtual int AddInput(wxSocketImplUnix *handler, int fd, SocketDir d)
{
return gdk_input_add
(

6
src/motif/sockmot.cpp
View File

@@ -23,7 +23,7 @@ extern "C" {
static void wxSocket_Motif_Input(XtPointer data, int *WXUNUSED(fid),
XtInputId *WXUNUSED(id))
{
wxSocketImpl * const handler = static_cast<wxSocketImpl *>(data);
wxSocketImplUnix * const handler = static_cast<wxSocketImplUnix *>(data);
handler->OnReadWaiting();
}
@@ -31,7 +31,7 @@ static void wxSocket_Motif_Input(XtPointer data, int *WXUNUSED(fid),
static void wxSocket_Motif_Output(XtPointer data, int *WXUNUSED(fid),
XtInputId *WXUNUSED(id))
{
wxSocketImpl * const handler = static_cast<wxSocketImpl *>(data);
wxSocketImplUnix * const handler = static_cast<wxSocketImplUnix *>(data);
handler->OnWriteWaiting();
}
@@ -41,7 +41,7 @@ static void wxSocket_Motif_Output(XtPointer data, int *WXUNUSED(fid),
class MotifSocketManager : public wxSocketInputBasedManager
{
public:
virtual int AddInput(wxSocketImpl *handler, int fd, SocketDir d)
virtual int AddInput(wxSocketImplUnix *handler, int fd, SocketDir d)
{
return XtAppAddInput
(

6
src/os2/sockpm.cpp
View File

@@ -23,14 +23,14 @@
static void wxSocket_PM_Input(void *data)
{
wxSocketImpl *handler = static_cast<wxSocketImpl *>(data);
wxSocketImplUnix *handler = static_cast<wxSocketImplUnix *>(data);
handler->OnReadWaiting();
}
static void wxSocket_PM_Output(void *data)
{
wxSocketImpl *handler = static_cast<wxSocketImpl *>(data);
wxSocketImplUnix *handler = static_cast<wxSocketImplUnix *>(data);
handler->OnWriteWaiting();
}
@@ -38,7 +38,7 @@ static void wxSocket_PM_Output(void *data)
class PMSocketManager : public wxSocketInputBasedManager
{
public:
virtual int AddInput(wxSocketImpl *handler, int fd, SocketDir d)
virtual int AddInput(wxSocketImplUnix *handler, int fd, SocketDir d)
{
if (d == FD_OUTPUT)
return wxTheApp->AddSocketHandler(fd, wxSockWriteMask,