fixing overrelease and out-of-bounds write, fixes #13725

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 321d348ab543d4aa06e17c0723c627b26fb25929..5a62be34442606dc6227182e6892fce4160f47ce 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -34,6 +34,8 @@
 // wxProtoInfo
 // ----------------------------------------------------------------------------
 
 // wxProtoInfo
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_CLASS(wxProtoInfo, wxObject)
+

 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
            : m_protoname(name),
 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
            : m_protoname(name),


@@ -70,6 +72,19 @@ wxProtocol::wxProtocol()
     SetDefaultTimeout(60);      // default timeout is 60 seconds
 }
 
     SetDefaultTimeout(60);      // default timeout is 60 seconds
 }
 

+void wxProtocol::SetDefaultTimeout(wxUint32 Value)
+{
+    m_uiDefaultTimeout = Value;
+#if wxUSE_SOCKETS
+    wxSocketBase::SetTimeout(Value); // sets it for this socket
+#endif
+}
+
+wxProtocol::~wxProtocol()
+{
+    delete m_log;
+}
+

 #if wxUSE_SOCKETS
 bool wxProtocol::Reconnect()
 {
 #if wxUSE_SOCKETS
 bool wxProtocol::Reconnect()
 {


@@ -90,19 +105,6 @@ bool wxProtocol::Reconnect()
     return true;
 }
 
     return true;
 }
 

-void wxProtocol::SetDefaultTimeout(wxUint32 Value)
-{
-    m_uiDefaultTimeout = Value;
-#if wxUSE_SOCKETS
-    wxSocketBase::SetTimeout(Value); // sets it for this socket
-#endif
-}
-
-wxProtocol::~wxProtocol()
-{
-    delete m_log;
-}
-

 // ----------------------------------------------------------------------------
 // Read a line from socket
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Read a line from socket
 // ----------------------------------------------------------------------------


@@ -137,7 +139,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             if ( eol == pBuf )
             {
                 // check for case of "\r\n" being split
             if ( eol == pBuf )
             {
                 // check for case of "\r\n" being split

-                if ( result.empty() || result.Last() != _T('\r') )
+                if ( result.empty() || result.Last() != wxT('\r') )

                 {
                     // ignore the stray '\n'
                     eol = NULL;
                 {
                     // ignore the stray '\n'
                     eol = NULL;


@@ -210,6 +212,7 @@ void wxProtocol::LogResponse(const wxString& str)
 
 void wxProtocolLog::DoLogString(const wxString& str)
 {
 
 void wxProtocolLog::DoLogString(const wxString& str)
 {

+    wxUnusedVar(str); // unused if wxLogTrace() is disabled

     wxLogTrace(m_traceMask, "%s", str);
 }
 
     wxLogTrace(m_traceMask, "%s", str);
 }