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

make string at least empty (instead of containing garbage) if malloc() failed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-10 12:07:53 +00:00
parent 286034884f
commit 50dee7e0eb
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/string.cpp
View File

@@ -260,17 +260,18 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
if ( !AllocBuffer(nLen) ) if ( !AllocBuffer(nLen) )
{ {
wxFAIL_MSG( _T("out of memory in wxString::wxString") ); wxFAIL_MSG( _T("out of memory in wxString::wxString") );
return;
} }
else
// MB2WC wants the buffer size, not the string length
if ( conv.MB2WC(m_pchData, psz, nLen + 1) != (size_t)-1 )
{ {
// initialized ok // MB2WC wants the buffer size, not the string length
m_pchData[nLen] = 0; if ( conv.MB2WC(m_pchData, psz, nLen + 1) != (size_t)-1 )
return; {
// initialized ok
m_pchData[nLen] = 0;
return;
}
//else: the conversion failed -- leave the string empty (what else?)
} }
//else: the conversion failed -- leave the string empty (what else?)
} }
Init(); Init();
@@ -301,16 +302,17 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
if ( !AllocBuffer(nLen) ) if ( !AllocBuffer(nLen) )
{ {
wxFAIL_MSG( _T("out of memory in wxString::wxString") ); wxFAIL_MSG( _T("out of memory in wxString::wxString") );
return;
} }
else
// WC2MB wants the buffer size, not the string length
if ( conv.WC2MB(m_pchData, pwz, nLen + 1) != (size_t)-1 )
{ {
// initialized ok // WC2MB wants the buffer size, not the string length
return; if ( conv.WC2MB(m_pchData, pwz, nLen + 1) != (size_t)-1 )
{
// initialized ok
return;
}
//else: the conversion failed -- leave the string empty (what else?)
} }
//else: the conversion failed -- leave the string empty (what else?)
} }
Init(); Init();