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

Applied patch [ 1192914 ] Null pointers in wxSocketBase / wxDatagramSocket

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-22 15:06:36 +00:00
parent a1b2d8d9b9
commit 11734f8af6
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/socket.cpp
View File

@@ -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) if (m_socket->GetSockOpt(level, optname, optval, optlen)
!= GSOCK_NOERROR) != 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, bool wxSocketBase::SetOption(int level, int optname, const void *optval,
int optlen) int optlen)
{ {
wxASSERT_MSG( m_socket, _T("Socket not initialised") );
if (m_socket->SetSockOpt(level, optname, optval, optlen) if (m_socket->SetSockOpt(level, optname, optval, optlen)
!= GSOCK_NOERROR) != GSOCK_NOERROR)
{ {
@@ -1304,6 +1308,8 @@ wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
const void* buf, const void* buf,
wxUint32 nBytes ) wxUint32 nBytes )
{ {
wxASSERT_MSG( m_socket, _T("Socket not initialised") );
m_socket->SetPeer(addr.GetAddress()); m_socket->SetPeer(addr.GetAddress());
Write(buf, nBytes); Write(buf, nBytes);
return (*this); return (*this);