Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxMBConv_iconv MT-safe by not using wxString in it.

Browse Source 
Use just "char *" for wxMBConv_iconv::m_name to avoid MT-safety problems
related to using a wxString (which is not always MT-safe) from multiple
threads.

See #12630.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-31 13:41:03 +00:00
parent 60d5c563d2
commit b64f93b67f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/strconv.cpp
View File

@@ -2113,7 +2113,7 @@ public:
virtual wxMBConv *Clone() const virtual wxMBConv *Clone() const
{ {
wxMBConv_iconv *p = new wxMBConv_iconv(m_name.ToAscii()); wxMBConv_iconv *p = new wxMBConv_iconv(m_name);
p->m_minMBCharWidth = m_minMBCharWidth; p->m_minMBCharWidth = m_minMBCharWidth;
return p; return p;
} }
@@ -2143,7 +2143,7 @@ private:
// name of the encoding handled by this conversion // name of the encoding handled by this conversion
wxString m_name; const char *m_name;
// cached result of GetMBNulLen(); set to 0 meaning "unknown" // cached result of GetMBNulLen(); set to 0 meaning "unknown"
// initially // initially
@@ -2167,7 +2167,7 @@ wxString wxMBConv_iconv::ms_wcCharsetName;
bool wxMBConv_iconv::ms_wcNeedsSwap = false; bool wxMBConv_iconv::ms_wcNeedsSwap = false;
wxMBConv_iconv::wxMBConv_iconv(const char *name) wxMBConv_iconv::wxMBConv_iconv(const char *name)
: m_name(name) : m_name(wxStrdup(name))
{ {
m_minMBCharWidth = 0; m_minMBCharWidth = 0;
@@ -2284,6 +2284,8 @@ wxMBConv_iconv::wxMBConv_iconv(const char *name)
wxMBConv_iconv::~wxMBConv_iconv() wxMBConv_iconv::~wxMBConv_iconv()
{ {
free(const_cast<char *>(m_name));
if ( m2w != ICONV_T_INVALID ) if ( m2w != ICONV_T_INVALID )
iconv_close(m2w); iconv_close(m2w);
if ( w2m != ICONV_T_INVALID ) if ( w2m != ICONV_T_INVALID )