Check for null pointer.

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 71bb8ea430aa6b99f0710598e8ab1edad6a9d84b..346896925a02c0f46e99276aa203550a196446cb 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -90,7 +90,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
   wxNode *node = m_headers.Find(header);
 
   if (!node)
-    m_headers.Append(header, (wxObject *)(new wxString(h_data)));
+    m_headers.Append(header.Upper(), (wxObject *)(new wxString(h_data)));
   else {
     wxString *str = (wxString *)node->GetData();
     (*str) = h_data;
@@ -293,15 +293,16 @@ protected:
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 {
-  size_t ret;
+    if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
+    {
+        m_lasterror = wxSTREAM_EOF;
+        return 0;
+    }
 
-  if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
-    return 0;
+    size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
+    m_read_bytes += ret;
 
-  ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
-  m_read_bytes += ret;
-
-  return ret;
+    return ret;
 }
 
 bool wxHTTP::Abort(void)