[Python-checkins] _Py_CoerceLegacyLocale() restores LC_CTYPE on fail (GH-9044)

[Victor Stinner]

https://github.com/python/cpython/commit/8ea09110d413829f71d979d8c7073008cb87fb03
commit: 8ea09110d413829f71d979d8c7073008cb87fb03
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2018-09-03T17:05:18+02:00
summary:

_Py_CoerceLegacyLocale() restores LC_CTYPE on fail (GH-9044)

bpo-34544: If _Py_CoerceLegacyLocale() fails to coerce the C locale,
restore the LC_CTYPE locale to the its previous value.

files:
M Python/pylifecycle.c

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 7d17f2e65e42..33ca802fd56d 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -363,6 +363,13 @@ void
 _Py_CoerceLegacyLocale(int warn)
 {
 #ifdef PY_COERCE_C_LOCALE
+    char *oldloc = NULL;
+
+    oldloc = _PyMem_RawStrdup(setlocale(LC_CTYPE, NULL));
+    if (oldloc == NULL) {
+        return;
+    }
+
     const char *locale_override = getenv("LC_ALL");
     if (locale_override == NULL || *locale_override == '\0') {
         /* LC_ALL is also not set (or is set to an empty string) */
@@ -384,11 +391,16 @@ defined(HAVE_LANGINFO_H) && defined(CODESET)
 #endif
                 /* Successfully configured locale, so make it the default */
                 _coerce_default_locale_settings(warn, target);
-                return;
+                goto done;
             }
         }
     }
     /* No C locale warning here, as Py_Initialize will emit one later */
+
+    setlocale(LC_CTYPE, oldloc);
+
+done:
+    PyMem_RawFree(oldloc);
 #endif
 }