From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 13 Nov 2003 07:43:21 +0000 (+0000)
Subject: Patch #804543: strdup saved locales. Backported to 2.3.
X-Git-Tag: v2.4a1~1288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f56d015a7123de2df3a32bc38f666a79dd8cab79;p=python

Patch #804543: strdup saved locales. Backported to 2.3.
---

diff --git a/Modules/readline.c b/Modules/readline.c
index 5053d1cc71..7535ecf5b9 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -611,7 +611,7 @@ static void
 setup_readline(void)
 {
 #ifdef SAVE_LOCALE
-	char *saved_locale = setlocale(LC_CTYPE, NULL);
+	char *saved_locale = strdup(setlocale(LC_CTYPE, NULL));
 #endif
 
 	using_history();
@@ -652,6 +652,7 @@ setup_readline(void)
 
 #ifdef SAVE_LOCALE
 	setlocale(LC_CTYPE, saved_locale); /* Restore locale */
+	free(saved_locale);
 #endif
 }
 
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 21c2cace81..ab6ed58e52 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -235,7 +235,7 @@ Py_Initialize(void)
 	   initialized by other means. Also set the encoding of
 	   stdin and stdout if these are terminals.  */
 
-	saved_locale = setlocale(LC_CTYPE, NULL);
+	saved_locale = strdup(setlocale(LC_CTYPE, NULL));
 	setlocale(LC_CTYPE, "");
 	codeset = nl_langinfo(CODESET);
 	if (codeset && *codeset) {
@@ -250,6 +250,7 @@ Py_Initialize(void)
 	} else
 		codeset = NULL;
 	setlocale(LC_CTYPE, saved_locale);
+	free(saved_locale);
 
 	if (codeset) {
 		sys_stream = PySys_GetObject("stdin");