From 73a0aac05448f8cf69ec476b8f3a7bcf6c6d2cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Mon, 18 Nov 2002 23:12:11 +0000
Subject: [PATCH] Fixed subtle memory allocation bug. Mysterious crashes in
 glibc may go away now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/intl.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 6e71405b98..162938cdac 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -666,7 +666,7 @@ bool wxLocale::Init(int language, int flags)
     wxString name = info->Description;
     wxString canonical = info->CanonicalName;
     wxString locale;
-    const wxChar *retloc;
+    wxString retloc;
 
     // Set the locale:
 #if defined(__UNIX__) && !defined(__WXMAC__)
@@ -677,12 +677,12 @@ bool wxLocale::Init(int language, int flags)
 
     retloc = wxSetlocale(LC_ALL, locale);
 
-    if (retloc == NULL)
+    if (retloc.empty())
     {
         // Some C libraries don't like xx_YY form and require xx only
         retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
     }
-    if (retloc == NULL)
+    if (retloc.empty())
     {
         // Some C libraries (namely glibc) still use old ISO 639,
         // so will translate the abbrev for them
@@ -692,13 +692,13 @@ bool wxLocale::Init(int language, int flags)
         else if (mid == wxT("yi")) locale = wxT("ji") + locale.Mid(3);
         retloc = wxSetlocale(LC_ALL, locale);
     }
-    if (retloc == NULL)
+    if (retloc.empty())
     {
         // (This time, we changed locale in previous if-branch, so try again.)
         // Some C libraries don't like xx_YY form and require xx only
         retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
     }
-    if (retloc == NULL)
+    if (retloc.empty())
     {
         wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
         return FALSE;
@@ -745,7 +745,7 @@ bool wxLocale::Init(int language, int flags)
     else
         retloc = wxSetlocale(LC_ALL, wxEmptyString);
 
-    if (retloc == NULL)
+    if (retloc.empty())
     {
         wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
         return FALSE;
@@ -756,7 +756,7 @@ bool wxLocale::Init(int language, int flags)
     return FALSE;
 #endif
 
-    return Init(name, canonical, wxString(retloc),
+    return Init(name, canonical, retloc,
                 (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                 (flags & wxLOCALE_CONV_ENCODING) != 0);
 }