From 0331b385a81f3dbda2ca1683c7160a9be9e0847f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 13 Sep 2005 13:30:13 +0000 Subject: [PATCH] removed strcpy to fixed buffer (do it the right way: cf rev 1.54) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/strconv.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index dd60679952..77adbd4e06 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -1363,10 +1363,9 @@ bool wxMBConv_iconv::ms_wcNeedsSwap = false; wxMBConv_iconv::wxMBConv_iconv(const wxChar *name) { - // Do it the hard way - char cname[100]; - for (size_t i = 0; i < wxStrlen(name)+1; i++) - cname[i] = (char) name[i]; + // iconv operates with chars, not wxChars, but luckily it uses only ASCII + // names for the charsets + const wxString cname = wxString::ToAscii(name); // check for charset that represents wchar_t: if (ms_wcCharsetName == NULL) -- 2.45.2