Applied patch [ 1192914 ] Null pointers in wxSocketBase / wxDatagramSocket

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index f4f42cc31f4ba7c0d14869dbb401c1d40ed21588..1acebe08f87f76f43574f18fe215363362bcc350 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1154,6 +1154,8 @@ bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
 
 bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)
 {
 
 bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)
 {

+    wxASSERT_MSG( m_socket, _T("Socket not initialised") );
+

     if (m_socket->GetSockOpt(level, optname, optval, optlen)
         != GSOCK_NOERROR)
     {
     if (m_socket->GetSockOpt(level, optname, optval, optlen)
         != GSOCK_NOERROR)
     {


@@ -1165,6 +1167,8 @@ bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)
 bool wxSocketBase::SetOption(int level, int optname, const void *optval,
                               int optlen)
 {
 bool wxSocketBase::SetOption(int level, int optname, const void *optval,
                               int optlen)
 {

+    wxASSERT_MSG( m_socket, _T("Socket not initialised") );
+    

     if (m_socket->SetSockOpt(level, optname, optval, optlen)
         != GSOCK_NOERROR)
     {
     if (m_socket->SetSockOpt(level, optname, optval, optlen)
         != GSOCK_NOERROR)
     {


@@ -1304,6 +1308,8 @@ wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
                                             const void* buf,
                                             wxUint32 nBytes )
 {
                                             const void* buf,
                                             wxUint32 nBytes )
 {

+    wxASSERT_MSG( m_socket, _T("Socket not initialised") );
+    

     m_socket->SetPeer(addr.GetAddress());
     Write(buf, nBytes);
     return (*this);
     m_socket->SetPeer(addr.GetAddress());
     Write(buf, nBytes);
     return (*this);