From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 18 Mar 2007 21:12:20 +0000 (+0000)
Subject: modify m_encoding, not m_name, in wxCSConv::CreateConvIfNeeded() if we don't have... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/02c7347b7fd198f4290b8e7350eaaaaf925595eb

modify m_encoding, not m_name, in wxCSConv::CreateConvIfNeeded() if we don't have either (as is the case with wxConvLocal); this fixes an infinite recursion in wxMac after the latest changes as wxLocale::GetSystemEncodingName() there returned empty (and not NULL) string which resulted in call to wxFontMapperBase::CharsetToEncoding() and reentrancy into wxConvLocal


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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 352e229b50..9d093143fe 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3505,7 +3505,7 @@ void wxCSConv::CreateConvIfNeeded() const
         if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
         {
 #if wxUSE_INTL
-            self->m_name = wxStrdup(wxLocale::GetSystemEncodingName());
+            self->m_encoding = wxLocale::GetSystemEncoding();
 #else
             // fallback to some reasonable default:
             self->m_encoding = wxFONTENCODING_ISO8859_1;