fixed memory leak in wxHTTP

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

diff --git a/docs/changes.txt b/docs/changes.txt
index f37b98079c59b47eb1c9aa6870550afcb37227f6..d6cefad1e9e2bcf5d88f22fd7fdf438a320884b5 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -68,6 +68,7 @@ wxBase:
 - fixes to the command line parsing error and usage messages
 - modified wxFileName::CreateTempFileName() to open the file atomically
   (if possible) and, especially, not to leak the file descriptors under Unix
+- memory leak in wxHTTP fixed (Dimitri)
 
 All (GUI):
 
@@ -82,6 +83,7 @@ wxMSW:
 - fixed redraw problems in dynamically resized wxStaticText
 - fixed wxProgressDialog for ranges > 65535
 - wxFontEnumerator now returns all fonts, not only TrueType ones
+- wxTextCtrl with wxTE_RICH flag scrolls to the end when text is appended to it
 
 2.3.2
 -----

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 7b4f5db705e1d9584c133ed4c5653ed3c89b160c..72080ba71d59fa4853ce29d58f899b56f99422be 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -50,6 +50,9 @@ protected:
   bool BuildRequest(const wxString& path, wxHTTP_Req req);
   void SendHeaders();
   bool ParseHeaders();
+
+  // deletes the header value strings
+  void ClearHeaders();
 };
 
 #endif // wxUSE_PROTOCOL_HTTP

diff --git a/src/common/http.cpp b/src/common/http.cpp
index bda7c28d0032749d5c33ba8d0ea31f15d5c32f24..55b44ed76d61747dbd706fd3035c77e827eab319 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -49,6 +49,13 @@ wxHTTP::wxHTTP()
 }
 
 wxHTTP::~wxHTTP()
+{
+    ClearHeaders();
+
+    delete m_addr;
+}
+
+void wxHTTP::ClearHeaders()
 {
   // wxString isn't a wxObject
   wxNode *node = m_headers.First();
@@ -60,10 +67,7 @@ wxHTTP::~wxHTTP()
     node = node->Next();
   }
 
-  if (m_addr) {
-      delete m_addr;
-      m_addr = NULL;
-  }
+  m_headers.Clear();
 }
 
 wxString wxHTTP::GetContentType()
@@ -79,7 +83,7 @@ void wxHTTP::SetProxyMode(bool on)
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {
-    m_headers.Clear();
+    ClearHeaders();
     m_read = FALSE;
   }
 
@@ -130,7 +134,7 @@ bool wxHTTP::ParseHeaders()
   wxString line;
   wxStringTokenizer tokenzr;
 
-  m_headers.Clear();
+  ClearHeaders();
   m_read = TRUE;
 
 #if defined(__VISAGECPP__)