X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ecf21b7db119d71e33e2651027570c4f91a690b..e776786754b4a54f90873b0f1801ba50f79c2d90:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index 2a3ce18e41..9f97667da3 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -267,6 +267,7 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength) if ( conv.MB2WC(m_pchData, psz, nLen + 1) != (size_t)-1 ) { // initialized ok + m_pchData[nLen] = 0; return; } //else: the conversion failed -- leave the string empty (what else?) @@ -773,7 +774,7 @@ wxString wxString::FromAscii(const char ascii) wxString res; res += (wchar_t)(unsigned char) ascii; - + return res; }