Skip to content

bpo-34170: Rework _PyCoreConfig_Read() to avoid side effect #8353

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 6 commits into from
Jul 21, 2018
Merged

bpo-34170: Rework _PyCoreConfig_Read() to avoid side effect #8353

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb2f02b
bpo-34170: Rework _PyCoreConfig_Read() to avoid side effect
vstinner Jul 20, 2018
c516906
Fix freeze_importlib
vstinner Jul 20, 2018
fdf5d4c
_PyCoreConfig_InitPathConfig() uses copy_wstr()
vstinner Jul 20, 2018
29a87b4
_Py_wstrlist_append() handles int overflow
vstinner Jul 20, 2018
7b633f0
Cleanup API
vstinner Jul 20, 2018
f004bea
Cleanup wstrlist_join()
vstinner Jul 20, 2018
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
Prev Previous commit
Next Next commit
_PyCoreConfig_InitPathConfig() uses copy_wstr() 
Py_SetPath() now fails with a fatal python error on memory allocation
failure.
  • Loading branch information
@vstinner
vstinner committed Jul 20, 2018
commit fdf5d4c22a8202947ff55f0c4ef20d111fa73eb9
28 changes: 16 additions & 12 deletions Python/pathconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,14 @@ _PyCoreConfig_InitPathConfig(_PyCoreConfig *config)
}

if (config->executable == NULL) {
config->executable = _PyMem_RawWcsdup(path_config.program_full_path);
if (config->executable == NULL) {
if (copy_wstr(&config->executable,
path_config.program_full_path) < 0) {
goto no_memory;
}
}

if (config->prefix == NULL) {
config->prefix = _PyMem_RawWcsdup(path_config.prefix);
if (config->prefix == NULL) {
if (copy_wstr(&config->prefix, path_config.prefix) < 0) {
goto no_memory;
}
}
Expand All @@ -320,31 +319,27 @@ _PyCoreConfig_InitPathConfig(_PyCoreConfig *config)
#else
wchar_t *exec_prefix = path_config.exec_prefix;
#endif
config->exec_prefix = _PyMem_RawWcsdup(exec_prefix);
if (config->exec_prefix == NULL) {
if (copy_wstr(&config->exec_prefix, exec_prefix) < 0) {
goto no_memory;
}
}

#ifdef MS_WINDOWS
if (config->dll_path == NULL) {
config->dll_path = _PyMem_RawWcsdup(path_config.dll_path);
if (config->dll_path == NULL) {
if (copy_wstr(&config->dll_path, path_config.dll_path) < 0) {
goto no_memory;
}
}
#endif

if (config->base_prefix == NULL) {
config->base_prefix = _PyMem_RawWcsdup(config->prefix);
if (config->base_prefix == NULL) {
if (copy_wstr(&config->base_prefix, config->prefix) < 0) {
goto no_memory;
}
}

if (config->base_exec_prefix == NULL) {
config->base_exec_prefix = _PyMem_RawWcsdup(config->exec_prefix);
if (config->base_exec_prefix == NULL) {
if (copy_wstr(&config->base_exec_prefix, config->exec_prefix) < 0) {
goto no_memory;
}
}
Expand Down Expand Up @@ -414,13 +409,18 @@ Py_SetPath(const wchar_t *path)

_PyPathConfig new_config;
new_config.program_full_path = _PyMem_RawWcsdup(Py_GetProgramName());
int alloc_error = (new_config.program_full_path == NULL);
new_config.prefix = _PyMem_RawWcsdup(L"");
alloc_error |= (new_config.prefix == NULL);
#ifdef MS_WINDOWS
new_config.dll_path = _PyMem_RawWcsdup(L"");
alloc_error |= (new_config.dll_path == NULL);
#else
new_config.exec_prefix = _PyMem_RawWcsdup(L"");
alloc_error |= (new_config.exec_prefix == NULL);
#endif
new_config.module_search_path = _PyMem_RawWcsdup(path);
alloc_error |= (new_config.module_search_path == NULL);

/* steal the home and program_name values (to leave them unchanged) */
new_config.home = _Py_path_config.home;
Expand All @@ -432,6 +432,10 @@ Py_SetPath(const wchar_t *path)
_Py_path_config = new_config;

PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);

if (alloc_error) {
Py_FatalError("Py_SetPath() failed: out of memory");
}
}


Expand Down