Put terminating NUL in the buffer since MB2WC doesn't do it.

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 2a3ce18e41040cb034cdb906a5eddfc0c678cae7..9f97667da3d72099ccdb084c6d7ab7e7b33bd2cf 100644 (file)
--- 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
         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?)
             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;
 
     wxString res;
     res += (wchar_t)(unsigned char) ascii;

-    
+

     return res;
 }
 
     return res;
 }