Fix Seeking to end of wxStreamInputStream (patch [ 1178834 ] string stream bad m_len...

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

diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp
index 4228a8a19e31fd5d0966c98151eba29a4dda3864..0e783fb64084a58a34148630fd88d2cf7ca47e37 100644 (file)
--- a/src/common/sstream.cpp
+++ b/src/common/sstream.cpp
@@ -36,7 +36,9 @@
 // construction/destruction
 // ----------------------------------------------------------------------------
 
 // construction/destruction
 // ----------------------------------------------------------------------------
 

-wxStringInputStream::wxStringInputStream(const wxString& s)
+// TODO:  Do we want to include the null char in the stream?  If so then
+// just add +1 to m_len in the ctor 
+wxStringInputStream::wxStringInputStream(const wxString& s) 

 #if wxUSE_UNICODE
     : m_str(s), m_buf(wxMBConvUTF8().cWX2MB(s).release()), m_len(strlen(m_buf))
 #else
 #if wxUSE_UNICODE
     : m_str(s), m_buf(wxMBConvUTF8().cWX2MB(s).release()), m_len(strlen(m_buf))
 #else


@@ -91,7 +93,7 @@ wxFileOffset wxStringInputStream::OnSysSeek(wxFileOffset ofs, wxSeekMode mode)
             return wxInvalidOffset;
     }
 
             return wxInvalidOffset;
     }
 

-    if ( ofs < 0 || wx_static_cast(size_t, ofs) >= m_len )
+    if ( ofs < 0 || wx_static_cast(size_t, ofs) > m_len )

         return wxInvalidOffset;
 
     m_pos = wx_static_cast(size_t, ofs);
         return wxInvalidOffset;
 
     m_pos = wx_static_cast(size_t, ofs);


@@ -154,9 +156,10 @@ size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
     // the literal length
     m_str->Append(wxString(p, m_conv, size));
 
     // the literal length
     m_str->Append(wxString(p, m_conv, size));
 

-    // return number of bytes actually written
+    // update position

     m_pos += size;
 
     m_pos += size;
 

+    // return number of bytes actually written

     return size;
 }
 
     return size;
 }