From: Stefan Csomor Date: Tue, 2 Nov 2004 09:03:35 +0000 (+0000) Subject: correcting allocated buffer size X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/db696b62388c193b71d4bd32b84358139e01d61a?ds=inline correcting allocated buffer size git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index c93bcc3132..6a4ff39c4f 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -2024,7 +2024,7 @@ public: if (buf == NULL) { //apple specs say at least 32 - n = 32 ; + n = max( 32 , byteInLen ) ; tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ; } ByteCount byteBufferLen = n * sizeof( UniChar ) ; @@ -2065,7 +2065,7 @@ public: if (buf == NULL) { //apple specs say at least 32 - n = 32; + n = max( 32 , ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T ); tbuf = (char*) malloc( n ) ; }