Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-04-07 20:49:34 +00:00
parent 3f37899571
commit cb28cc9e75
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/sstream.cpp
View File

@@ -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 #if wxUSE_UNICODE
: m_str(s), m_buf(wxMBConvUTF8().cWX2MB(s).release()), m_len(strlen(m_buf)) : m_str(s), m_buf(wxMBConvUTF8().cWX2MB(s).release()), m_len(strlen(m_buf))
#else #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; return wxInvalidOffset;
m_pos = wx_static_cast(size_t, ofs); 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 // the literal length
m_str->Append(wxString(p, m_conv, size)); 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;
} }