return empty string, not NULL, from wxCStrData::AsChar() if conversion to ANSI fails...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/string.cpp b/src/common/string.cpp
index d0a6a445691b1b242f75676a89aaeb1d821a2a10..db04dad9722fe787204769d1bed4bab9a5ac85b6 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -235,6 +235,12 @@ const char* wxCStrData::AsChar() const
     // convert the string:
     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
     if ( str->m_convertedToChar &&
          strlen(buf) == strlen(str->m_convertedToChar) )
@@ -261,6 +267,10 @@ const wchar_t* wxCStrData::AsWChar() const
     // convert the string:
     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
     if ( str->m_convertedToWChar &&
          wxWcslen(buf) == wxWcslen(str->m_convertedToWChar) )