X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..9cf99fc093f9c45b6b5d8d8b357699d826c9916a:/src/common/datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 2ea158faae..e0bd854d4c 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux 
+// Copyright:   (c) Guilhem Lavaux
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -86,22 +86,29 @@ double wxDataInputStream::ReadDouble()
 
 wxString wxDataInputStream::ReadString()
 {
-  wxString wx_string;
-  char *string;
-  unsigned long len;
+  size_t len;
 
   len = Read32();
-  string = new char[len+1];
 
-  m_input->Read(string, len);
-
-  string[len] = 0;
-  wx_string = string;
-  delete string;
-
-  return wx_string;
+  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;
+#else
+    wxString s;
+    m_input->Read(s.GetWriteBuf(len), len);
+    s.UngetWriteBuf();
+#endif
+    return s;
+  }
+  else
+    return wxEmptyString;
 }
-  
+
 wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
 {
   s = ReadString();
@@ -200,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
@@ -229,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;
@@ -285,4 +293,4 @@ wxDataOutputStream& wxDataOutputStream::operator<<(float f)
 
 #endif
   // wxUSE_STREAMS
-  
+