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

return empty string, not NULL, from wxCStrData::AsChar() if conversion to ANSI fails for compatibility with wxWidgets 2 and std::string

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-09 18:57:41 +00:00
parent 37ba70a520
commit 28be59b4ad
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/string.cpp
View File

@@ -235,6 +235,12 @@ const char* wxCStrData::AsChar() const
// convert the string: // convert the string:
wxCharBuffer buf(str->mb_str()); wxCharBuffer buf(str->mb_str());
// if it failed, return empty string and not NULL to avoid crashes in code
// written with either wxWidgets 2 wxString or std::string behaviour in
// mind: neither of them ever returns NULL and so we shouldn't neither
if ( !buf )
return "";
// FIXME-UTF8: do the conversion in-place in the existing buffer // FIXME-UTF8: do the conversion in-place in the existing buffer
if ( str->m_convertedToChar && if ( str->m_convertedToChar &&
strlen(buf) == strlen(str->m_convertedToChar) ) strlen(buf) == strlen(str->m_convertedToChar) )
@@ -261,6 +267,10 @@ const wchar_t* wxCStrData::AsWChar() const
// convert the string: // convert the string:
wxWCharBuffer buf(str->wc_str()); wxWCharBuffer buf(str->wc_str());
// notice that here, unlike above in AsChar(), conversion can't fail as our
// internal UTF-8 is always well-formed -- or the string was corrupted and
// all bets are off anyhow
// FIXME-UTF8: do the conversion in-place in the existing buffer // FIXME-UTF8: do the conversion in-place in the existing buffer
if ( str->m_convertedToWChar && if ( str->m_convertedToWChar &&
wxWcslen(buf) == wxWcslen(str->m_convertedToWChar) ) wxWcslen(buf) == wxWcslen(str->m_convertedToWChar) )