From e267793aa4101b2771ed0e66aaff5743d23f59af Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 21 Sep 2019 01:50:16 +0200 Subject: bpo-38234: Fix PyConfig_Read() when Py_SetPath() was called (GH-16298) * If Py_SetPath() has been called, _PyConfig_InitPathConfig() now uses its value. * Py_Initialize() now longer copies path configuration from PyConfig to the global path configuration (_Py_path_config). --- Python/pathconfig.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Python/pathconfig.c') diff --git a/Python/pathconfig.c b/Python/pathconfig.c index ccab8327425..2d00f4b6b12 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -74,6 +74,13 @@ pathconfig_calculate(_PyPathConfig *pathconfig, const PyConfig *config) PyMemAllocatorEx old_alloc; _PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc); + if (copy_wstr(&new_config.module_search_path, + _Py_path_config.module_search_path) < 0) + { + status = _PyStatus_NO_MEMORY(); + goto error; + } + /* Calculate program_full_path, prefix, exec_prefix, dll_path (Windows), and module_search_path */ status = _PyPathConfig_Calculate(&new_config, config); -- cgit v1.2.3