X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5da0ce7cb746318511b3974b7882c72c0de45e2..1cb311851d96ed4fb5290c65455075c6989f7142:/src/common/sckipc.cpp

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 0ece73c6b0..3b03e2de76 100644
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -36,6 +36,7 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/event.h"
+    #include "wx/module.h"
 #endif
 
 #include <stdlib.h>
@@ -43,7 +44,6 @@
 #include <errno.h>
 
 #include "wx/socket.h"
-#include "wx/module.h"
 
 // --------------------------------------------------------------------------
 // macros and constants
@@ -356,15 +356,17 @@ wxTCPConnection::wxTCPConnection(wxChar *buffer, int size)
 wxTCPConnection::~wxTCPConnection ()
 {
   Disconnect();
-  wxDELETE(m_codeci);
-  wxDELETE(m_codeco);
-  wxDELETE(m_sockstrm);
 
   if (m_sock)
   {
     m_sock->SetClientData(NULL);
     m_sock->Destroy();
   }
+
+  /* Delete after destroy */
+  wxDELETE(m_codeci);
+  wxDELETE(m_codeco);
+  wxDELETE(m_sockstrm);
 }
 
 void wxTCPConnection::Compress(bool WXUNUSED(on))
@@ -424,6 +426,7 @@ wxChar *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat f
     size_t s;
 
     s = m_codeci->Read32();
+
     wxChar *data = GetBufferAtLeast( s );
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxTCPConnection::Request") );
@@ -521,6 +524,9 @@ END_EVENT_TABLE()
 void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 {
   wxSocketBase *sock = event.GetSocket();
+  if (!sock) {		/* No socket, no glory */
+    return ;
+  }
   wxSocketNotify evt = event.GetSocketEvent();
   wxTCPConnection *connection = (wxTCPConnection *)(sock->GetClientData());
 
@@ -559,6 +565,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
+    
     data = connection->GetBufferAtLeast( size );
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxTCPEventHandler::Client_OnRequest") );
@@ -670,6 +677,9 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
 {
   wxSocketServer *server = (wxSocketServer *) event.GetSocket();
+  if (!server) {		/* No server, Then exit */
+	  return ;
+  }
   wxTCPServer *ipcserv = (wxTCPServer *) server->GetClientData();
 
   // This socket is being deleted; skip this event
@@ -681,6 +691,9 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
 
   // Accept the connection, getting a new socket
   wxSocketBase *sock = server->Accept();
+  if (!sock) {		/* No socket, no glory */
+	  return ;
+  }
   if (!sock->Ok())
   {
     sock->Destroy();