X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ae47e3f2bcbe7ae0bcc4c889c7221bc8fc26bea..1f5b2017df82762a758f9428d0bb0e838a10251a:/src/common/datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 5c4fd46091..e0bd854d4c 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -90,19 +90,23 @@ wxString wxDataInputStream::ReadString()
 
   len = Read32();
 
+  if (len > 0)
+  {
 #if wxUSE_UNICODE
-  char *tmp = new char[len + 1];
-  m_input->Read(tmp, len);
-  tmp[len] = 0;
-  wxString s(tmp);
-  delete[] tmp;
+    char *tmp = new char[len + 1];
+    m_input->Read(tmp, len);
+    tmp[len] = 0;
+    wxString s(tmp);
+    delete[] tmp;
 #else
-  wxString s;
-  m_input->Read(s.GetWriteBuf(len), len);
-  s.UngetWriteBuf();
+    wxString s;
+    m_input->Read(s.GetWriteBuf(len), len);
+    s.UngetWriteBuf();
 #endif
-
-  return s;
+    return s;
+  }
+  else
+    return wxEmptyString;
 }
 
 wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
@@ -203,8 +207,9 @@ void wxDataOutputStream::Write8(wxUint8 i)
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   const wxWX2MBbuf buf = string.mb_str();
-  Write32(string.Length());
-  m_output->Write(buf, string.Len());
+  Write32(string.Len());
+  if (string.Len() > 0)
+      m_output->Write(buf, string.Len());
 }
 
 // Must be at global scope for VC++ 5
@@ -232,7 +237,7 @@ wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
   return *this;
 }
 
-wxDataOutputStream& wxDataOutputStream::operator<<(wxString& string)
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
 {
   WriteString(string);
   return *this;