X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f54cb154d59a7205b0f2829b5aea31882a379d60..c1ea6afb878385e2586007fc85fef05c2c722a2b:/include/wx/string.h?ds=sidebyside diff --git a/include/wx/string.h b/include/wx/string.h index 26fa4b4e4b..65e29e10ec 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -209,7 +209,7 @@ inline int Stricmp(const char *psz1, const char *psz2) // Lightweight object returned by wxString::c_str() and implicitly convertible // to either const char* or const wchar_t*. -class WXDLLIMPEXP_BASE wxCStrData +class wxCStrData { private: // Ctors; for internal use by wxString and wxCStrData only @@ -3510,7 +3510,18 @@ private: // about it and doing it like this, i.e. having a separate AsChar(), // allows us to avoid the creation and destruction of a temporary buffer // when using wxCStrData without duplicating any code - AsChar(conv); + if ( !AsChar(conv) ) + { + // although it would be probably more correct to return NULL buffer + // from here if the conversion fails, a lot of existing code doesn't + // expect mb_str() (or wc_str()) to ever return NULL so return an + // empty string otherwise to avoid crashes in it + // + // also, some existing code does check for the conversion success and + // so asserting here would be bad too -- even if it does mean that + // silently losing data is possible for badly written code + return wxScopedCharBuffer::CreateNonOwned("", 0); + } return m_convertedToChar.AsScopedBuffer(); } @@ -3529,7 +3540,8 @@ private: // wc_str() implementation helper wxScopedWCharBuffer AsWCharBuf(const wxMBConv& conv) const { - AsWChar(conv); + if ( !AsWChar(conv) ) + return wxScopedWCharBuffer::CreateNonOwned(L"", 0); return m_convertedToWChar.AsScopedBuffer(); }