mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-34207: Fix pymain_read_conf() for UTF-8 Mode (GH-8868)

Browse source 
bpo-34170, bpo-34207: pymain_read_conf() now sets Py_UTF8Mode to
config->utf8_mode. pymain_read_conf() calls indirectly
Py_DecodeLocale() and Py_EncodeLocale() which depend on Py_UTF8Mode.
This commit is contained in:
Victor Stinner 2018-08-23 12:23:46 +02:00 • committed by GitHub
parent ccd9975267
commit 89487f51b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/main.c
View file

@ -1286,6 +1286,7 @@ static int
pymain_read_conf(_PyMain *pymain, _PyCoreConfig *config, pymain_read_conf(_PyMain *pymain, _PyCoreConfig *config,
_PyCmdline *cmdline) _PyCmdline *cmdline)
{ {
int init_utf8_mode = Py_UTF8Mode;
_PyCoreConfig save_config = _PyCoreConfig_INIT; _PyCoreConfig save_config = _PyCoreConfig_INIT;
char *oldloc = NULL; char *oldloc = NULL;
int res = -1; int res = -1;
@ -1319,6 +1320,10 @@ pymain_read_conf(_PyMain *pymain, _PyCoreConfig *config,
goto done; goto done;
} }
/* bpo-34207: Py_DecodeLocale(), Py_EncodeLocale() and similar
functions depend on Py_UTF8Mode. */
Py_UTF8Mode = config->utf8_mode;
if (pymain_init_cmdline_argv(pymain, config, cmdline) < 0) { if (pymain_init_cmdline_argv(pymain, config, cmdline) < 0) {
goto done; goto done;
} }
@ -1383,6 +1388,7 @@ done:
setlocale(LC_ALL, oldloc); setlocale(LC_ALL, oldloc);
PyMem_RawFree(oldloc); PyMem_RawFree(oldloc);
} }
Py_UTF8Mode = init_utf8_mode ;
return res; return res;
} }