mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
bpo-42260: Fix _PyConfig_Read() if compute_path_config=0 (GH-23220)
Fix _PyConfig_Read() if compute_path_config=0: use values set by Py_SetPath(), Py_SetPythonHome() and Py_SetProgramName(). Add compute_path_config parameter to _PyConfig_InitPathConfig(). The following functions now return NULL if called before Py_Initialize(): * Py_GetExecPrefix() * Py_GetPath() * Py_GetPrefix() * Py_GetProgramFullPath() * Py_GetProgramName() * Py_GetPythonHome() These functions no longer automatically computes the Python Path Configuration. Moreover, Py_SetPath() no longer computes program_full_path.
This commit is contained in:
Victor Stinner
GitHub
parent
1e996c3a3b
commit
ace3f9a0ce
8 changed files with 93 additions and 95 deletions
|
|
@ -2069,8 +2069,8 @@ config_read(PyConfig *config, int compute_path_config)
|
|||
}
|
||||
}
|
||||
|
||||
if (compute_path_config && config->_install_importlib) {
|
||||
status = _PyConfig_InitPathConfig(config);
|
||||
if (config->_install_importlib) {
|
||||
status = _PyConfig_InitPathConfig(config, compute_path_config);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
return status;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -332,7 +332,8 @@ config_init_module_search_paths(PyConfig *config, _PyPathConfig *pathconfig)
|
|||
- _PyPathConfig_Calculate()
|
||||
*/
|
||||
static PyStatus
|
||||
pathconfig_calculate(_PyPathConfig *pathconfig, const PyConfig *config)
|
||||
pathconfig_init(_PyPathConfig *pathconfig, const PyConfig *config,
|
||||
int compute_path_config)
|
||||
{
|
||||
PyStatus status;
|
||||
|
||||
|
|
@ -349,12 +350,9 @@ pathconfig_calculate(_PyPathConfig *pathconfig, const PyConfig *config)
|
|||
goto done;
|
||||
}
|
||||
|
||||
if (_Py_path_config.module_search_path == NULL) {
|
||||
if (compute_path_config) {
|
||||
status = _PyPathConfig_Calculate(pathconfig, config);
|
||||
}
|
||||
else {
|
||||
/* Py_SetPath() has been called: avoid _PyPathConfig_Calculate() */
|
||||
}
|
||||
|
||||
done:
|
||||
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
||||
|
|
@ -363,17 +361,19 @@ done:
|
|||
|
||||
|
||||
static PyStatus
|
||||
config_calculate_pathconfig(PyConfig *config)
|
||||
config_init_pathconfig(PyConfig *config, int compute_path_config)
|
||||
{
|
||||
_PyPathConfig pathconfig = _PyPathConfig_INIT;
|
||||
PyStatus status;
|
||||
|
||||
status = pathconfig_calculate(&pathconfig, config);
|
||||
status = pathconfig_init(&pathconfig, config, compute_path_config);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
goto done;
|
||||
}
|
||||
|
||||
if (!config->module_search_paths_set) {
|
||||
if (!config->module_search_paths_set
|
||||
&& pathconfig.module_search_path != NULL)
|
||||
{
|
||||
status = config_init_module_search_paths(config, &pathconfig);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
goto done;
|
||||
|
|
@ -381,7 +381,7 @@ config_calculate_pathconfig(PyConfig *config)
|
|||
}
|
||||
|
||||
#define COPY_ATTR(PATH_ATTR, CONFIG_ATTR) \
|
||||
if (config->CONFIG_ATTR == NULL) { \
|
||||
if (config->CONFIG_ATTR == NULL && pathconfig.PATH_ATTR != NULL) { \
|
||||
if (copy_wstr(&config->CONFIG_ATTR, pathconfig.PATH_ATTR) < 0) { \
|
||||
goto no_memory; \
|
||||
} \
|
||||
|
|
@ -427,7 +427,7 @@ done:
|
|||
|
||||
|
||||
PyStatus
|
||||
_PyConfig_InitPathConfig(PyConfig *config)
|
||||
_PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
|
||||
{
|
||||
/* Do we need to calculate the path? */
|
||||
if (!config->module_search_paths_set
|
||||
|
|
@ -435,26 +435,26 @@ _PyConfig_InitPathConfig(PyConfig *config)
|
|||
|| config->prefix == NULL
|
||||
|| config->exec_prefix == NULL)
|
||||
{
|
||||
PyStatus status = config_calculate_pathconfig(config);
|
||||
PyStatus status = config_init_pathconfig(config, compute_path_config);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
||||
if (config->base_prefix == NULL) {
|
||||
if (config->base_prefix == NULL && config->prefix != NULL) {
|
||||
if (copy_wstr(&config->base_prefix, config->prefix) < 0) {
|
||||
return _PyStatus_NO_MEMORY();
|
||||
}
|
||||
}
|
||||
|
||||
if (config->base_exec_prefix == NULL) {
|
||||
if (config->base_exec_prefix == NULL && config->exec_prefix != NULL) {
|
||||
if (copy_wstr(&config->base_exec_prefix,
|
||||
config->exec_prefix) < 0) {
|
||||
return _PyStatus_NO_MEMORY();
|
||||
}
|
||||
}
|
||||
|
||||
if (config->base_executable == NULL) {
|
||||
if (config->base_executable == NULL && config->executable != NULL) {
|
||||
if (copy_wstr(&config->base_executable,
|
||||
config->executable) < 0) {
|
||||
return _PyStatus_NO_MEMORY();
|
||||
|
|
@ -465,53 +465,6 @@ _PyConfig_InitPathConfig(PyConfig *config)
|
|||
}
|
||||
|
||||
|
||||
static PyStatus
|
||||
pathconfig_global_read(_PyPathConfig *pathconfig)
|
||||
{
|
||||
PyConfig config;
|
||||
_PyConfig_InitCompatConfig(&config);
|
||||
|
||||
/* Call _PyConfig_InitPathConfig() */
|
||||
PyStatus status = PyConfig_Read(&config);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
goto done;
|
||||
}
|
||||
|
||||
status = pathconfig_set_from_config(pathconfig, &config);
|
||||
|
||||
done:
|
||||
PyConfig_Clear(&config);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
pathconfig_global_init(void)
|
||||
{
|
||||
PyStatus status;
|
||||
|
||||
if (_Py_path_config.module_search_path == NULL) {
|
||||
status = pathconfig_global_read(&_Py_path_config);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
Py_ExitStatusException(status);
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* Global configuration already initialized */
|
||||
}
|
||||
|
||||
assert(_Py_path_config.program_full_path != NULL);
|
||||
assert(_Py_path_config.prefix != NULL);
|
||||
assert(_Py_path_config.exec_prefix != NULL);
|
||||
assert(_Py_path_config.module_search_path != NULL);
|
||||
assert(_Py_path_config.program_name != NULL);
|
||||
/* home can be NULL */
|
||||
#ifdef MS_WINDOWS
|
||||
assert(_Py_path_config.base_executable != NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
/* External interface */
|
||||
|
||||
static void _Py_NO_RETURN
|
||||
|
|
@ -531,23 +484,17 @@ Py_SetPath(const wchar_t *path)
|
|||
PyMemAllocatorEx old_alloc;
|
||||
_PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
||||
|
||||
/* Getting the program full path calls pathconfig_global_init() */
|
||||
wchar_t *program_full_path = _PyMem_RawWcsdup(Py_GetProgramFullPath());
|
||||
|
||||
PyMem_RawFree(_Py_path_config.program_full_path);
|
||||
PyMem_RawFree(_Py_path_config.prefix);
|
||||
PyMem_RawFree(_Py_path_config.exec_prefix);
|
||||
PyMem_RawFree(_Py_path_config.module_search_path);
|
||||
|
||||
_Py_path_config.program_full_path = program_full_path;
|
||||
_Py_path_config.prefix = _PyMem_RawWcsdup(L"");
|
||||
_Py_path_config.exec_prefix = _PyMem_RawWcsdup(L"");
|
||||
_Py_path_config.module_search_path = _PyMem_RawWcsdup(path);
|
||||
|
||||
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
||||
|
||||
if (_Py_path_config.program_full_path == NULL
|
||||
|| _Py_path_config.prefix == NULL
|
||||
if (_Py_path_config.prefix == NULL
|
||||
|| _Py_path_config.exec_prefix == NULL
|
||||
|| _Py_path_config.module_search_path == NULL)
|
||||
{
|
||||
|
|
@ -621,7 +568,6 @@ _Py_SetProgramFullPath(const wchar_t *program_full_path)
|
|||
wchar_t *
|
||||
Py_GetPath(void)
|
||||
{
|
||||
pathconfig_global_init();
|
||||
return _Py_path_config.module_search_path;
|
||||
}
|
||||
|
||||
|
|
@ -629,7 +575,6 @@ Py_GetPath(void)
|
|||
wchar_t *
|
||||
Py_GetPrefix(void)
|
||||
{
|
||||
pathconfig_global_init();
|
||||
return _Py_path_config.prefix;
|
||||
}
|
||||
|
||||
|
|
@ -637,7 +582,6 @@ Py_GetPrefix(void)
|
|||
wchar_t *
|
||||
Py_GetExecPrefix(void)
|
||||
{
|
||||
pathconfig_global_init();
|
||||
return _Py_path_config.exec_prefix;
|
||||
}
|
||||
|
||||
|
|
@ -645,7 +589,6 @@ Py_GetExecPrefix(void)
|
|||
wchar_t *
|
||||
Py_GetProgramFullPath(void)
|
||||
{
|
||||
pathconfig_global_init();
|
||||
return _Py_path_config.program_full_path;
|
||||
}
|
||||
|
||||
|
|
@ -653,7 +596,6 @@ Py_GetProgramFullPath(void)
|
|||
wchar_t*
|
||||
Py_GetPythonHome(void)
|
||||
{
|
||||
pathconfig_global_init();
|
||||
return _Py_path_config.home;
|
||||
}
|
||||
|
||||
|
|
@ -661,7 +603,6 @@ Py_GetPythonHome(void)
|
|||
wchar_t *
|
||||
Py_GetProgramName(void)
|
||||
{
|
||||
pathconfig_global_init();
|
||||
return _Py_path_config.program_name;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1039,7 +1039,7 @@ init_interp_main(PyThreadState *tstate)
|
|||
}
|
||||
|
||||
// Compute the path configuration
|
||||
status = _PyConfig_InitPathConfig(&interp->config);
|
||||
status = _PyConfig_InitPathConfig(&interp->config, 1);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
return status;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue