[ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation' with minor modifi...

[wxWidgets.git] / src / mac / carbon / textctrl.cpp

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 95729897ce59657883d7661b58a6c07ae2c5fabf..36a9d22ced6ad7b2a3092fdb5c97196787bcfac8 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1574,9 +1574,11 @@ wxString wxMacMLTEControl::GetStringValue() const
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 wxMBConvUTF16 converter ;
                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 wxMBConvUTF16 converter ;
                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;

+                               wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") );

                 ptr = new wxChar[noChars + 1] ;
 
                 ptr = new wxChar[noChars + 1] ;
 

-                noChars = converter.MB2WC( ptr , (const char*)*theText , noChars ) ;
+                noChars = converter.MB2WC( ptr , (const char*)*theText , noChars + 1 ) ;
+                               wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") );

                 ptr[noChars] = 0 ;
                 HUnlock( theText ) ;
 #endif
                 ptr[noChars] = 0 ;
                 HUnlock( theText ) ;
 #endif