X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da6e77b8d6a48f70f6741959e499561dd06ff472..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/sstream.cpp diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp index 4228a8a19e..0e783fb640 100644 --- a/src/common/sstream.cpp +++ b/src/common/sstream.cpp @@ -36,7 +36,9 @@ // 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 @@ -91,7 +93,7 @@ wxFileOffset wxStringInputStream::OnSysSeek(wxFileOffset ofs, wxSeekMode mode) 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); @@ -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)); - // return number of bytes actually written + // update position m_pos += size; + // return number of bytes actually written return size; }