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

10
src/common/string.cpp
View File

@@ -260,9 +260,9 @@ 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 // MB2WC wants the buffer size, not the string length
if ( conv.MB2WC(m_pchData, psz, nLen + 1) != (size_t)-1 ) if ( conv.MB2WC(m_pchData, psz, nLen + 1) != (size_t)-1 )
{ {
@@ -272,6 +272,7 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
} }
//else: the conversion failed -- leave the string empty (what else?) //else: the conversion failed -- leave the string empty (what else?)
} }
}
Init(); Init();
} }
@@ -301,9 +302,9 @@ 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 // WC2MB wants the buffer size, not the string length
if ( conv.WC2MB(m_pchData, pwz, nLen + 1) != (size_t)-1 ) if ( conv.WC2MB(m_pchData, pwz, nLen + 1) != (size_t)-1 )
{ {
@@ -312,6 +313,7 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
} }
//else: the conversion failed -- leave the string empty (what else?) //else: the conversion failed -- leave the string empty (what else?)
} }
}
Init(); Init();
} }