X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4227afa4f748870bbfce75047db465f024e0ac1d..4997d3014cd76b41f2d4036dfd168ad886972f35:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 8597373f54..9612c11ca9 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -177,9 +177,11 @@ const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
         {
             // now do the actual conversion
             wxWCharBuffer buf(nLen);
-            MB2WC(buf.data(), psz, nLen + 1); // with the trailing NUL
-
-            return buf;
+            nLen = MB2WC(buf.data(), psz, nLen + 1); // with the trailing NULL
+            if ( nLen != (size_t)-1 )
+            {
+                return buf;
+            }
         }
     }
 
@@ -196,9 +198,11 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
         if ( nLen != (size_t)-1 )
         {
             wxCharBuffer buf(nLen+3);       // space for a wxUint32 trailing zero
-            WC2MB(buf.data(), pwz, nLen + 4);
-
-            return buf;
+            nLen = WC2MB(buf.data(), pwz, nLen + 4);
+            if ( nLen != (size_t)-1 )
+            {
+                return buf;
+            }
         }
     }
 
@@ -1331,13 +1335,16 @@ public:
 		}
 	    ByteCount byteBufferLen = n * sizeof( UniChar ) ; 
 #if SIZEOF_WCHAR_T == 4
-		ubuf = (UniChar*) malloc( byteBufferLen ) ;
+		ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
 #else
 		ubuf = (UniChar*) (buf ? buf : tbuf) ;
 #endif
 	    status = TECConvertText(m_MB2WC_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
 	      (TextPtr) ubuf , byteBufferLen, &byteOutLen);
 #if SIZEOF_WCHAR_T == 4
+        // we have to terminate here, because n might be larger for the trailing zero, and if UniChar
+        // is not properly terminated we get random characters at the end
+        ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
 		wxMBConvUTF16BE converter ;
 		res = converter.MB2WC( (buf ? buf : tbuf) , (const char*)ubuf , n ) ;
 		free( ubuf ) ;