_Py_CoerceLegacyLocale() restores LC_CTYPE on fail (GH-9044) (GH-9046)
bpo-34544: If _Py_CoerceLegacyLocale() fails to coerce the C locale,
restore the LC_CTYPE locale to the its previous value.
(cherry picked from commit 8ea09110d413829f71d979d8c7073008cb87fb03)
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 539d62a..ba4b548 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -475,6 +475,13 @@
_Py_CoerceLegacyLocale(const _PyCoreConfig *config)
{
#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) */
@@ -496,11 +503,16 @@
#endif
/* Successfully configured locale, so make it the default */
_coerce_default_locale_settings(config, 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
}