Check for buffer being big enough in wxPathOnly().

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 5d7cb3e38d388e9d88ca33fac88237edd1999694..16bdbd45639c1527175f4b248354fab23218f77c 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -206,7 +206,11 @@ wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
 
 void wxLocale::DoCommonInit()
 {
 
 void wxLocale::DoCommonInit()
 {

-    m_pszOldLocale = NULL;
+    // Store the current locale in order to be able to restore it in the dtor.
+    m_pszOldLocale = wxSetlocale(LC_ALL, NULL);
+    if ( m_pszOldLocale )
+        m_pszOldLocale = wxStrdup(m_pszOldLocale);
+

 
     m_pOldLocale = wxSetLocale(this);
 
 
     m_pOldLocale = wxSetLocale(this);
 


@@ -285,13 +289,7 @@ bool wxLocale::DoInit(const wxString& name,
                     wxS("no locale to set in wxLocale::Init()") );
     }
 
                     wxS("no locale to set in wxLocale::Init()") );
     }
 

-    const char *oldLocale = wxSetlocale(LC_ALL, szLocale);
-    if ( oldLocale )
-        m_pszOldLocale = wxStrdup(oldLocale);
-    else
-        m_pszOldLocale = NULL;
-
-    if ( m_pszOldLocale == NULL )
+    if ( !wxSetlocale(LC_ALL, szLocale) )

     {
         wxLogError(_("locale '%s' cannot be set."), szLocale);
     }
     {
         wxLogError(_("locale '%s' cannot be set."), szLocale);
     }


@@ -1444,10 +1442,10 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
         // this were not the case.
         wxASSERT_MSG( strcmp(setlocale(LC_ALL, NULL), "C") == 0,
                       wxS("You probably called setlocale() directly instead ")
         // this were not the case.
         wxASSERT_MSG( strcmp(setlocale(LC_ALL, NULL), "C") == 0,
                       wxS("You probably called setlocale() directly instead ")

-                      wxS("of calling wxSetLocale() and now there is a ")
+                      wxS("of using wxLocale and now there is a ")

                       wxS("mismatch between C/C++ and Windows locale.\n")
                       wxS("mismatch between C/C++ and Windows locale.\n")

-                      wxS("Things are going to break, use wxSetLocale() to ")
-                      wxS("avoid this!") );
+                      wxS("Things are going to break, please only change ")
+                      wxS("locale by creating wxLocale objects to avoid this!") );

 
 
         // Return the hard coded values for C locale. This is really the right
 
 
         // Return the hard coded values for C locale. This is really the right