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

don't crash in ReadString() if the length read from the stream is too big (bug 1933560)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-05 17:28:32 +00:00
parent 2bbbb7892f
commit c336299eb6
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/datstrm.cpp
View File

@@ -100,25 +100,27 @@ double wxDataInputStream::ReadDouble()
wxString wxDataInputStream::ReadString()
{
size_t len;
len = Read32();
if (len > 0)
{
#if wxUSE_UNICODE
wxCharBuffer tmp(len + 1);
m_input->Read(tmp.data(), len);
tmp.data()[len] = '\0';
wxString ret(m_conv->cMB2WX(tmp.data()));
#else
wxString ret;
m_input->Read( wxStringBuffer(ret, len), len);
const size_t len = Read32();
if ( len > 0 )
{
#if wxUSE_UNICODE
wxCharBuffer tmp(len + 1);
if ( tmp )
{
m_input->Read(tmp.data(), len);
tmp.data()[len] = '\0';
ret = m_conv->cMB2WX(tmp.data());
}
#else
wxStringBuffer buf(ret, len);
if ( buf )
m_input->Read(buf, len);
#endif
}
return ret;
}
else
return wxEmptyString;
}
#if wxUSE_LONGLONG