don't crash on weird line endings like \r\r\n

[wxWidgets.git] / src / common / protocol.cpp

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 82179840587f6b9e22c2c6cbc667de1edf838f0a..7f1ba9d358f0d6a900091286215afdb9ee5eb8c5 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        protocol.cpp
+// Name:        src/common/protocol.cpp
 // Purpose:     Implement protocol base class
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -9,22 +9,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "protocol.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_PROTOCOL
 
 #include "wx/protocol/protocol.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/module.h"
+#endif
+
 #include "wx/url.h"
-#include "wx/module.h"
 
 #include <stdlib.h>
 
@@ -45,8 +45,12 @@ wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
 {
     m_cinfo = info;
     m_needhost = need_host1;
+#if wxUSE_URL
     next = wxURL::ms_protocols;
     wxURL::ms_protocols = this;
+#else
+    next = NULL;
+#endif
 }
 
 /////////////////////////////////////////////////////////////////
@@ -74,16 +78,16 @@ bool wxProtocol::Reconnect()
     if (!GetPeer(addr))
     {
         Close();
-        return FALSE;
+        return false;
     }
 
     if (!Close())
-        return FALSE;
-        
+        return false;
+
     if (!Connect(addr))
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -98,10 +102,11 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
     result.clear();
 
     wxCharBuffer buf(LINE_BUF);
+    char *pBuf = buf.data();
     while ( sock->WaitForRead() )
     {
         // peek at the socket to see if there is a CRLF
-        sock->Peek(buf.data(), LINE_BUF);
+        sock->Peek(pBuf, LINE_BUF);
 
         size_t nRead = sock->LastCount();
         if ( !nRead && sock->Error() )
@@ -110,13 +115,13 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
         // look for "\r\n" paying attention to a special case: "\r\n" could
         // have been split by buffer boundary, so check also for \r at the end
         // of the last chunk and \n at the beginning of this one
-        buf.data()[nRead] = '\0';
-        const char *eol = strchr(buf, '\n');
+        pBuf[nRead] = '\0';
+        const char *eol = strchr(pBuf, '\n');
 
         // if we found '\n', is there a '\r' as well?
         if ( eol )
         {
-            if ( eol == buf.data() )
+            if ( eol == pBuf )
             {
                 // check for case of "\r\n" being split
                 if ( result.empty() || result.Last() != _T('\r') )
@@ -132,7 +137,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             else // '\n' in the middle of the buffer
             {
                 // in any case, read everything up to and including '\n'
-                nRead = eol - buf + 1;
+                nRead = eol - pBuf + 1;
 
                 if ( eol[-1] != '\r' )
                 {
@@ -142,12 +147,12 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             }
         }
 
-        sock->Read(buf.data(), nRead);
+        sock->Read(pBuf, nRead);
         if ( sock->LastCount() != nRead )
             return wxPROTO_NETERR;
 
-        buf.data()[nRead] = '\0';
-        result += wxString::FromAscii(buf);
+        pBuf[nRead] = '\0';
+        result += wxString::FromAscii(pBuf);
 
         if ( eol )
         {
@@ -183,29 +188,28 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
 
     // Not implemented on all systems
     // ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
-    found = FALSE;
+    found = false;
     for (ret=tmp_str;ret < (tmp_str+avail); ret++)
-        if (*ret == '\n') 
+        if (*ret == '\n')
         {
-            found = TRUE;
+            found = true;
             break;
         }
 
     if (!found)
         return wxPROTO_PROTERR;
-        
+
     *ret = 0;
 
     result = wxString::FromAscii( tmp_str );
-    result = result.Left(result.Length()-1);
+    result = result.Left(result.length()-1);
 
     size = ret-tmp_str+1;
     sock->Unread(&tmp_buf[size], avail-size);
-  
+
     return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
 #endif // wxUSE_SOCKETS
 
 #endif // wxUSE_PROTOCOL
-