fixed memory leak in Accept()

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index c5b1bab4e4e4dad3ce86fb1564e7e8525897f14d..7ec0743ec109a5a7ad75c44cd1dca9ba881248a2 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -481,7 +481,7 @@ wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
   {
     bool more = TRUE;
 
   {
     bool more = TRUE;
 

-    while (more)            
+    while (more)

     {
       if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
         break;
     {
       if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
         break;


@@ -1010,7 +1010,7 @@ wxUint32 wxSocketBase::GetPushback(void *buffer, wxUint32 size, bool peek)
 
 
 // ==========================================================================
 
 
 // ==========================================================================

-// wxSocketServer                             
+// wxSocketServer

 // ==========================================================================
 
 // --------------------------------------------------------------------------
 // ==========================================================================
 
 // --------------------------------------------------------------------------


@@ -1088,7 +1088,10 @@ wxSocketBase *wxSocketServer::Accept(bool wait)
   sock->SetFlags(m_flags);
 
   if (!AcceptWith(*sock, wait))
   sock->SetFlags(m_flags);
 
   if (!AcceptWith(*sock, wait))

-    return NULL;
+  {
+    sock->Destroy();
+    sock = NULL;
+  }

 
   return sock;
 }
 
   return sock;
 }