Skip to content

bpo-36356: Fix _PyCoreConfig_Read() #12454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Mar 20, 2019
Merged

bpo-36356: Fix _PyCoreConfig_Read() #12454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 32 additions & 23 deletions Python/coreconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,13 +961,15 @@ config_read_env_vars(_PyCoreConfig *config)
config->malloc_stats = 1;
}

wchar_t *path;
int res = _PyCoreConfig_GetEnvDup(config, &path,
L"PYTHONPATH", "PYTHONPATH");
if (res < 0) {
return DECODE_LOCALE_ERR("PYTHONPATH", res);
if (config->module_search_path_env == NULL) {
wchar_t *path;
int res = _PyCoreConfig_GetEnvDup(config, &path,
L"PYTHONPATH", "PYTHONPATH");
if (res < 0) {
return DECODE_LOCALE_ERR("PYTHONPATH", res);
}
config->module_search_path_env = path;
}
config->module_search_path_env = path;

if (config->use_hash_seed < 0) {
_PyInitError err = config_init_hash_seed(config);
Expand Down Expand Up @@ -1689,28 +1691,32 @@ config_parse_cmdline(_PyCoreConfig *config, _PyCmdline *cmdline,
}

if (c == 'c') {
/* -c is the last option; following arguments
that look like options are left for the
command to interpret. */
size_t len = wcslen(_PyOS_optarg) + 1 + 1;
wchar_t *command = PyMem_RawMalloc(sizeof(wchar_t) * len);
if (command == NULL) {
return _Py_INIT_NO_MEMORY();
if (config->run_command == NULL) {
/* -c is the last option; following arguments
that look like options are left for the
command to interpret. */
size_t len = wcslen(_PyOS_optarg) + 1 + 1;
wchar_t *command = PyMem_RawMalloc(sizeof(wchar_t) * len);
if (command == NULL) {
return _Py_INIT_NO_MEMORY();
}
memcpy(command, _PyOS_optarg, (len - 2) * sizeof(wchar_t));
command[len - 2] = '\n';
command[len - 1] = 0;
config->run_command = command;
}
memcpy(command, _PyOS_optarg, (len - 2) * sizeof(wchar_t));
command[len - 2] = '\n';
command[len - 1] = 0;
config->run_command = command;
break;
}

if (c == 'm') {
/* -m is the last option; following arguments
that look like options are left for the
module to interpret. */
config->run_module = _PyMem_RawWcsdup(_PyOS_optarg);
if (config->run_module == NULL) {
return _Py_INIT_NO_MEMORY();
config->run_module = _PyMem_RawWcsdup(_PyOS_optarg);
if (config->run_module == NULL) {
return _Py_INIT_NO_MEMORY();
}
}
break;
}
Expand Down Expand Up @@ -1825,7 +1831,8 @@ config_parse_cmdline(_PyCoreConfig *config, _PyCmdline *cmdline,

if (config->run_command == NULL && config->run_module == NULL
&& _PyOS_optind < cmdline->argv.length
&& wcscmp(cmdline->argv.items[_PyOS_optind], L"-") != 0)
&& wcscmp(cmdline->argv.items[_PyOS_optind], L"-") != 0
&& config->run_filename == NULL)
{
config->run_filename = _PyMem_RawWcsdup(cmdline->argv.items[_PyOS_optind]);
if (config->run_filename == NULL) {
Expand Down Expand Up @@ -2032,9 +2039,11 @@ config_from_cmdline(_PyCoreConfig *config, _PyCmdline *cmdline,

_PyCoreConfig_GetGlobalConfig(config);

err = config_init_program(config, cmdline);
if (_Py_INIT_FAILED(err)) {
return err;
if (config->program == NULL) {
err = config_init_program(config, cmdline);
if (_Py_INIT_FAILED(err)) {
return err;
}
}

err = config_parse_cmdline(config, cmdline, &need_usage);
Expand Down