X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef1991645ae0a3524c6cc11b1224ee07c9ba54ee..a3669332df65cfae18e7540a267bc3400a64aa09:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index ec964238eb..3f00282a39 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -150,7 +150,8 @@ static size_t decode_utf16(const wxUint16* input, wxUint32& output)
 static wxUint32 wxDecodeSurrogate(const wxDecodeSurrogate_t **pSrc)
 {
     wxUint32 out;
-    const size_t n = decode_utf16(*pSrc, out);
+    const size_t
+        n = decode_utf16(wx_reinterpret_cast(const wxUint16 *, *pSrc), out);
     if ( n == wxCONV_FAILED )
         *pSrc = NULL;
     else
@@ -2759,7 +2760,7 @@ public:
     {
         OSStatus status = noErr ;
         ByteCount byteOutLen ;
-        ByteCount byteInLen = strlen(psz) ;
+        ByteCount byteInLen = strlen(psz) + 1;
         wchar_t *tbuf = NULL ;
         UniChar* ubuf = NULL ;
         size_t res = 0 ;