increase worst case to *4 for UTF8, switch a memcpy for wxMemcpy

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index b03a8229e779cae1f273589e62a2db6560c21af3..9c6c1b19fb019813b06ea1f39c704dd6f4946118 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -273,7 +273,7 @@ bool wxStringBase::CopyBeforeWrite()
       // allocation failures are handled by the caller
       return false;
     }
-    memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar));
+    wxMemcpy(m_pchData, pData->data(), nLen);
   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
@@ -1187,8 +1187,8 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {
-        //*2 is the worst case - probably for UTF8
-        wxStringBufferLength internalBuffer(*this, (nLen << 1) + 1);
+        //*4 is the worst case - for UTF8
+        wxStringBufferLength internalBuffer(*this, (nLen << 2) + 1);
 
         //Do the actual conversion & Set the length of the buffer
         internalBuffer.SetLength(