another instance of #804543: use strdup() when saving the result of setlocale() because it could be overwritten by subsequent setlocale()s.

georg.brandl · georg.brandl · commit 97d8cc5cb614 · 2009-02-27T17:52:38.000Z
git-svn-id: http://svn.python.org/projects/python/branches/py3k@70029 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Modules/python.c b/Modules/python.c
@@ -37,7 +37,7 @@ main(int argc, char **argv)
 		fprintf(stderr, "out of memory\n");
 		return 1;
 	}
-	oldloc = setlocale(LC_ALL, NULL);
+	oldloc = strdup(setlocale(LC_ALL, NULL));
 	setlocale(LC_ALL, "");
 	for (i = 0; i < argc; i++) {
 #ifdef HAVE_BROKEN_MBSTOWCS
@@ -67,6 +67,7 @@ main(int argc, char **argv)
 		}
 	}
 	setlocale(LC_ALL, oldloc);
+	free(oldloc);
 	res = Py_Main(argc, argv_copy);
 	for (i = 0; i < argc; i++) {
 		PyMem_Free(argv_copy2[i]);

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ main(int argc, char **argv)`
`37`	`37`	`fprintf(stderr, "out of memory\n");`
`38`	`38`	`return 1;`
`39`	`39`	`}`
`40`		`- oldloc = setlocale(LC_ALL, NULL);`
	`40`	`+ oldloc = strdup(setlocale(LC_ALL, NULL));`
`41`	`41`	`setlocale(LC_ALL, "");`
`42`	`42`	`for (i = 0; i < argc; i++) {`
`43`	`43`	`#ifdef HAVE_BROKEN_MBSTOWCS`
`@@ -67,6 +67,7 @@ main(int argc, char **argv)`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`setlocale(LC_ALL, oldloc);`
	`70`	`+ free(oldloc);`
`70`	`71`	`res = Py_Main(argc, argv_copy);`
`71`	`72`	`for (i = 0; i < argc; i++) {`
`72`	`73`	`PyMem_Free(argv_copy2[i]);`