Mailman 3 September 2019 - Python-checkins

bpo-38304: Remove PyConfig.struct_size (GH-16500)
by Nick Coghlan 30 Sep '19

30 Sep '19

https://github.com/python/cpython/commit/bdace21b769998396d0ccc8da99a8ca9b5… commit: bdace21b769998396d0ccc8da99a8ca9b507bfdf branch: 3.8 author: Victor Stinner <vstinner(a)redhat.com> committer: Nick Coghlan <ncoghlan(a)gmail.com> date: 2019-10-01T08:46:42+10:00 summary: bpo-38304: Remove PyConfig.struct_size (GH-16500) For now, we'll rely on the fact that the config structures aren't covered by the stable ABI. We may revisit this in the future if we further explore the idea of offering a stable embedding API. files: D Misc/NEWS.d/next/C API/2019-09-28-03-43-27.bpo-38304.RqHAwd.rst M Doc/c-api/init_config.rst M Include/cpython/initconfig.h M Include/internal/pycore_initconfig.h M Modules/main.c M PC/python_uwp.cpp M Programs/_freeze_importlib.c M Programs/_testembed.c M Python/frozenmain.c M Python/initconfig.c M Python/pathconfig.c M Python/preconfig.c M Python/pylifecycle.c M Python/pystate.c diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst index 4c77d5d1e0e8..15b8b94d5a74 100644 --- a/Doc/c-api/init_config.rst +++ b/Doc/c-api/init_config.rst @@ -194,25 +194,18 @@ PyPreConfig * Configure the LC_CTYPE locale * Set the UTF-8 mode - The :c:member:`struct_size` field must be explicitly initialized to - ``sizeof(PyPreConfig)``. - Function to initialize a preconfiguration: - .. c:function:: PyStatus PyPreConfig_InitIsolatedConfig(PyPreConfig *preconfig) + .. c:function:: void PyPreConfig_InitIsolatedConfig(PyPreConfig *preconfig) Initialize the preconfiguration with :ref:`Python Configuration <init-python-config>`. - .. c:function:: PyStatus PyPreConfig_InitPythonConfig(PyPreConfig *preconfig) + .. c:function:: void PyPreConfig_InitPythonConfig(PyPreConfig *preconfig) Initialize the preconfiguration with :ref:`Isolated Configuration <init-isolated-conf>`. - The caller of these functions is responsible to handle exceptions (error or - exit) using :c:func:`PyStatus_Exception` and - :c:func:`Py_ExitStatusException`. - Structure fields: .. c:member:: int allocator @@ -274,13 +267,6 @@ PyPreConfig same way the regular Python parses command line arguments: see :ref:`Command Line Arguments <using-on-cmdline>`. - .. c:member:: size_t struct_size - - Size of the structure in bytes: must be initialized to - ``sizeof(PyPreConfig)``. - - Field used for API and ABI compatibility. - .. c:member:: int use_environment See :c:member:`PyConfig.use_environment`. @@ -332,12 +318,7 @@ Example using the preinitialization to enable the UTF-8 Mode:: PyStatus status; PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = PyPreConfig_InitPythonConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + PyPreConfig_InitPythonConfig(&preconfig); preconfig.utf8_mode = 1; @@ -360,9 +341,6 @@ PyConfig Structure containing most parameters to configure Python. - The :c:member:`struct_size` field must be explicitly initialized to - ``sizeof(PyConfig)``. - Structure methods: .. c:function:: PyStatus PyConfig_InitPythonConfig(PyConfig *config) @@ -679,13 +657,6 @@ PyConfig Encoding and encoding errors of :data:`sys.stdin`, :data:`sys.stdout` and :data:`sys.stderr`. - .. c:member:: size_t struct_size - - Size of the structure in bytes: must be initialized to - ``sizeof(PyConfig)``. - - Field used for API and ABI compatibility. - .. c:member:: int tracemalloc If non-zero, call :func:`tracemalloc.start` at startup. @@ -754,7 +725,6 @@ Example setting the program name:: { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -787,7 +757,6 @@ configuration, and then override some parameters:: { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -875,7 +844,6 @@ Example of customized Python always running in isolated mode:: { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1067,7 +1035,6 @@ phases:: { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h index 8ce5622c5c40..25e02cea10dc 100644 --- a/Include/cpython/initconfig.h +++ b/Include/cpython/initconfig.h @@ -45,10 +45,6 @@ PyAPI_FUNC(PyStatus) PyWideStringList_Insert(PyWideStringList *list, /* --- PyPreConfig ----------------------------------------------- */ typedef struct { - /* Size of the structure in bytes: must be initialized to - sizeof(PyPreConfig). Field used for API and ABI compatibility. */ - size_t struct_size; - int _config_init; /* _PyConfigInitEnum value */ /* Parse Py_PreInitializeFromBytesArgs() arguments? @@ -124,17 +120,13 @@ typedef struct { int allocator; } PyPreConfig; -PyAPI_FUNC(PyStatus) PyPreConfig_InitPythonConfig(PyPreConfig *config); -PyAPI_FUNC(PyStatus) PyPreConfig_InitIsolatedConfig(PyPreConfig *config); +PyAPI_FUNC(void) PyPreConfig_InitPythonConfig(PyPreConfig *config); +PyAPI_FUNC(void) PyPreConfig_InitIsolatedConfig(PyPreConfig *config); /* --- PyConfig ---------------------------------------------- */ typedef struct { - /* Size of the structure in bytes: must be initialized to - sizeof(PyConfig). Field used for API and ABI compatibility. */ - size_t struct_size; - int _config_init; /* _PyConfigInitEnum value */ int isolated; /* Isolated mode? see PyPreConfig.isolated */ diff --git a/Include/internal/pycore_initconfig.h b/Include/internal/pycore_initconfig.h index eb6490f5a87f..e9810bcf90a8 100644 --- a/Include/internal/pycore_initconfig.h +++ b/Include/internal/pycore_initconfig.h @@ -120,8 +120,8 @@ extern PyStatus _PyPreCmdline_Read(_PyPreCmdline *cmdline, /* --- PyPreConfig ----------------------------------------------- */ -PyAPI_FUNC(PyStatus) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig); -extern PyStatus _PyPreConfig_InitFromConfig( +PyAPI_FUNC(void) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig); +extern void _PyPreConfig_InitFromConfig( PyPreConfig *preconfig, const PyConfig *config); extern PyStatus _PyPreConfig_InitFromPreConfig( diff --git a/Misc/NEWS.d/next/C API/2019-09-28-03-43-27.bpo-38304.RqHAwd.rst b/Misc/NEWS.d/next/C API/2019-09-28-03-43-27.bpo-38304.RqHAwd.rst deleted file mode 100644 index b797933d05d6..000000000000 --- a/Misc/NEWS.d/next/C API/2019-09-28-03-43-27.bpo-38304.RqHAwd.rst +++ /dev/null @@ -1,3 +0,0 @@ -Add a new ``struct_size`` field to :c:type:`PyPreConfig` and :c:type:`PyConfig` -structures to allow to modify these structures in the future without breaking -the backward compatibility. diff --git a/Modules/main.c b/Modules/main.c index 13936add4f3e..66af89f56122 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -53,12 +53,7 @@ pymain_init(const _PyArgv *args) #endif PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = PyPreConfig_InitPythonConfig(&preconfig); - if (_PyStatus_EXCEPTION(status)) { - return status; - } + PyPreConfig_InitPythonConfig(&preconfig); status = _Py_PreInitializeFromPyArgv(&preconfig, args); if (_PyStatus_EXCEPTION(status)) { @@ -66,7 +61,7 @@ pymain_init(const _PyArgv *args) } PyConfig config; - config.struct_size = sizeof(PyConfig); + status = PyConfig_InitPythonConfig(&config); if (_PyStatus_EXCEPTION(status)) { goto done; diff --git a/PC/python_uwp.cpp b/PC/python_uwp.cpp index 2656d188c250..758c8f73725e 100644 --- a/PC/python_uwp.cpp +++ b/PC/python_uwp.cpp @@ -165,12 +165,8 @@ int wmain(int argc, wchar_t **argv) { PyStatus status; - PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - PyConfig config; - config.struct_size = sizeof(PyConfig); const wchar_t *moduleName = NULL; const wchar_t *p = wcsrchr(argv[0], L'\\'); @@ -189,10 +185,7 @@ wmain(int argc, wchar_t **argv) } } - status = PyPreConfig_InitPythonConfig(&preconfig); - if (PyStatus_Exception(status)) { - goto fail_without_config; - } + PyPreConfig_InitPythonConfig(&preconfig); if (!moduleName) { status = Py_PreInitializeFromArgs(&preconfig, argc, argv); if (PyStatus_Exception(status)) { diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c index 7c494c2786c0..74735f279c58 100644 --- a/Programs/_freeze_importlib.c +++ b/Programs/_freeze_importlib.c @@ -78,7 +78,6 @@ main(int argc, char *argv[]) PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitIsolatedConfig(&config); if (PyStatus_Exception(status)) { diff --git a/Programs/_testembed.c b/Programs/_testembed.c index c8600d58f0b4..d2d4c7f8c651 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -385,12 +385,7 @@ static int check_init_compat_config(int preinit) if (preinit) { PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = _PyPreConfig_InitCompatConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + _PyPreConfig_InitCompatConfig(&preconfig); status = Py_PreInitialize(&preconfig); if (PyStatus_Exception(status)) { @@ -399,7 +394,6 @@ static int check_init_compat_config(int preinit) } PyConfig config; - config.struct_size = sizeof(PyConfig); status = _PyConfig_InitCompatConfig(&config); if (PyStatus_Exception(status)) { @@ -478,15 +472,8 @@ static int test_init_global_config(void) static int test_init_from_config(void) { - PyStatus status; - PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = _PyPreConfig_InitCompatConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + _PyPreConfig_InitCompatConfig(&preconfig); putenv("PYTHONMALLOC=malloc_debug"); preconfig.allocator = PYMEM_ALLOCATOR_MALLOC; @@ -495,13 +482,12 @@ static int test_init_from_config(void) Py_UTF8Mode = 0; preconfig.utf8_mode = 1; - status = Py_PreInitialize(&preconfig); + PyStatus status = Py_PreInitialize(&preconfig); if (PyStatus_Exception(status)) { Py_ExitStatusException(status); } PyConfig config; - config.struct_size = sizeof(PyConfig); status = _PyConfig_InitCompatConfig(&config); if (PyStatus_Exception(status)) { @@ -638,7 +624,6 @@ static int check_init_parse_argv(int parse_argv) PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -725,7 +710,6 @@ static int test_init_python_env(void) set_all_env_vars(); PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -780,7 +764,6 @@ static int test_init_isolated_flag(void) /* Test PyConfig.isolated=1 */ PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -803,25 +786,17 @@ static int test_init_isolated_flag(void) /* PyPreConfig.isolated=1, PyConfig.isolated=0 */ static int test_preinit_isolated1(void) { - PyStatus status; - PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = _PyPreConfig_InitCompatConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + _PyPreConfig_InitCompatConfig(&preconfig); preconfig.isolated = 1; - status = Py_PreInitialize(&preconfig); + PyStatus status = Py_PreInitialize(&preconfig); if (PyStatus_Exception(status)) { Py_ExitStatusException(status); } PyConfig config; - config.struct_size = sizeof(PyConfig); status = _PyConfig_InitCompatConfig(&config); if (PyStatus_Exception(status)) { @@ -840,26 +815,19 @@ static int test_preinit_isolated1(void) /* PyPreConfig.isolated=0, PyConfig.isolated=1 */ static int test_preinit_isolated2(void) { - PyStatus status; - PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = _PyPreConfig_InitCompatConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + _PyPreConfig_InitCompatConfig(&preconfig); preconfig.isolated = 0; - status = Py_PreInitialize(&preconfig); + PyStatus status = Py_PreInitialize(&preconfig); if (PyStatus_Exception(status)) { Py_ExitStatusException(status); } /* Test PyConfig.isolated=1 */ PyConfig config; - config.struct_size = sizeof(PyConfig); + status = _PyConfig_InitCompatConfig(&config); if (PyStatus_Exception(status)) { Py_ExitStatusException(status); @@ -880,15 +848,8 @@ static int test_preinit_isolated2(void) static int test_preinit_dont_parse_argv(void) { - PyStatus status; - PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = PyPreConfig_InitIsolatedConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + PyPreConfig_InitIsolatedConfig(&preconfig); preconfig.isolated = 0; @@ -899,13 +860,13 @@ static int test_preinit_dont_parse_argv(void) L"-X", L"dev", L"-X", L"utf8", L"script.py"}; - status = Py_PreInitializeFromArgs(&preconfig, Py_ARRAY_LENGTH(argv), argv); + PyStatus status = Py_PreInitializeFromArgs(&preconfig, + Py_ARRAY_LENGTH(argv), argv); if (PyStatus_Exception(status)) { Py_ExitStatusException(status); } PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitIsolatedConfig(&config); if (PyStatus_Exception(status)) { @@ -931,7 +892,6 @@ static int test_preinit_parse_argv(void) { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -989,12 +949,7 @@ static int check_preinit_isolated_config(int preinit) if (preinit) { PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = PyPreConfig_InitIsolatedConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + PyPreConfig_InitIsolatedConfig(&preconfig); status = Py_PreInitialize(&preconfig); if (PyStatus_Exception(status)) { @@ -1007,7 +962,6 @@ static int check_preinit_isolated_config(int preinit) } PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitIsolatedConfig(&config); if (PyStatus_Exception(status)) { @@ -1058,12 +1012,7 @@ static int check_init_python_config(int preinit) if (preinit) { PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = PyPreConfig_InitPythonConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + PyPreConfig_InitPythonConfig(&preconfig); status = Py_PreInitialize(&preconfig); if (PyStatus_Exception(status)) { @@ -1072,7 +1021,6 @@ static int check_init_python_config(int preinit) } PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1101,27 +1049,19 @@ static int test_init_python_config(void) static int test_init_dont_configure_locale(void) { - PyStatus status; - PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = PyPreConfig_InitPythonConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + PyPreConfig_InitPythonConfig(&preconfig); preconfig.configure_locale = 0; preconfig.coerce_c_locale = 1; preconfig.coerce_c_locale_warn = 1; - status = Py_PreInitialize(&preconfig); + PyStatus status = Py_PreInitialize(&preconfig); if (PyStatus_Exception(status)) { Py_ExitStatusException(status); } PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1140,7 +1080,6 @@ static int test_init_dev_mode(void) { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1365,7 +1304,6 @@ static int run_audit_run_test(int argc, wchar_t **argv, void *test) { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1415,7 +1353,6 @@ static int test_init_read_set(void) { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1465,7 +1402,6 @@ static int test_init_sys_add(void) PySys_AddWarnOption(L"ignore:::sysadd_warnoption"); PyConfig config; - config.struct_size = sizeof(PyConfig); PyStatus status; status = PyConfig_InitPythonConfig(&config); @@ -1533,18 +1469,12 @@ static int test_init_setpath(void) static int test_init_setpath_config(void) { - PyStatus status; PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - - status = PyPreConfig_InitPythonConfig(&preconfig); - if (PyStatus_Exception(status)) { - Py_ExitStatusException(status); - } + PyPreConfig_InitPythonConfig(&preconfig); /* Explicitly preinitializes with Python preconfiguration to avoid Py_SetPath() implicit preinitialization with compat preconfiguration. */ - status = Py_PreInitialize(&preconfig); + PyStatus status = Py_PreInitialize(&preconfig); if (PyStatus_Exception(status)) { Py_ExitStatusException(status); } @@ -1564,7 +1494,6 @@ static int test_init_setpath_config(void) putenv("TESTPATH="); PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1612,7 +1541,6 @@ static int test_init_warnoptions(void) PySys_AddWarnOption(L"ignore:::PySys_AddWarnOption2"); PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1680,7 +1608,6 @@ static int test_init_run_main(void) { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1697,7 +1624,6 @@ static int test_init_main(void) { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { @@ -1729,7 +1655,6 @@ static int test_run_main(void) { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { diff --git a/Python/frozenmain.c b/Python/frozenmain.c index 76309e9e5da2..c56938ab4899 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -40,7 +40,6 @@ Py_FrozenMain(int argc, char **argv) } PyConfig config; - config.struct_size = sizeof(PyConfig); status = PyConfig_InitPythonConfig(&config); if (PyStatus_Exception(status)) { PyConfig_Clear(&config); diff --git a/Python/initconfig.c b/Python/initconfig.c index fb04b4a2d22b..9164c7cfc8e8 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -529,17 +529,6 @@ Py_GetArgcArgv(int *argc, wchar_t ***argv) : _PyStatus_NO_MEMORY()) -static PyStatus -config_check_struct_size(const PyConfig *config) -{ - if (config->struct_size != sizeof(PyConfig)) { - return _PyStatus_ERR("unsupported PyConfig structure size " - "(Python version mismatch?)"); - } - return _PyStatus_OK(); -} - - /* Free memory allocated in config, but don't clear all attributes */ void PyConfig_Clear(PyConfig *config) @@ -583,15 +572,7 @@ PyConfig_Clear(PyConfig *config) PyStatus _PyConfig_InitCompatConfig(PyConfig *config) { - size_t struct_size = config->struct_size; memset(config, 0, sizeof(*config)); - config->struct_size = struct_size; - - PyStatus status = config_check_struct_size(config); - if (_PyStatus_EXCEPTION(status)) { - _PyStatus_UPDATE_FUNC(status); - return status; - } config->_config_init = (int)_PyConfig_INIT_COMPAT; config->isolated = -1; @@ -775,18 +756,6 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2) { PyStatus status; - status = config_check_struct_size(config); - if (_PyStatus_EXCEPTION(status)) { - _PyStatus_UPDATE_FUNC(status); - return status; - } - - status = config_check_struct_size(config2); - if (_PyStatus_EXCEPTION(status)) { - _PyStatus_UPDATE_FUNC(status); - return status; - } - PyConfig_Clear(config); #define COPY_ATTR(ATTR) config->ATTR = config2->ATTR @@ -2275,7 +2244,6 @@ core_read_precmdline(PyConfig *config, _PyPreCmdline *precmdline) } PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); status = _PyPreConfig_InitFromPreConfig(&preconfig, &_PyRuntime.preconfig); if (_PyStatus_EXCEPTION(status)) { @@ -2428,12 +2396,6 @@ PyConfig_Read(PyConfig *config) PyStatus status; PyWideStringList orig_argv = _PyWideStringList_INIT; - status = config_check_struct_size(config); - if (_PyStatus_EXCEPTION(status)) { - _PyStatus_UPDATE_FUNC(status); - return status; - } - status = _Py_PreInitializeFromConfig(config, NULL); if (_PyStatus_EXCEPTION(status)) { return status; diff --git a/Python/pathconfig.c b/Python/pathconfig.c index 41ef7d28d066..ff4bbf2a97eb 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -434,7 +434,6 @@ pathconfig_global_read(_PyPathConfig *pathconfig) { PyStatus status; PyConfig config; - config.struct_size = sizeof(PyConfig); status = _PyConfig_InitCompatConfig(&config); if (_PyStatus_EXCEPTION(status)) { diff --git a/Python/preconfig.c b/Python/preconfig.c index 01c72f5d6bad..89a6227fa672 100644 --- a/Python/preconfig.c +++ b/Python/preconfig.c @@ -269,29 +269,10 @@ _PyPreCmdline_Read(_PyPreCmdline *cmdline, const PyPreConfig *preconfig) /* --- PyPreConfig ----------------------------------------------- */ -static PyStatus -preconfig_check_struct_size(PyPreConfig *config) -{ - if (config->struct_size != sizeof(PyPreConfig)) { - return _PyStatus_ERR("unsupported PyPreConfig structure size " - "(Python version mismatch?)"); - } - return _PyStatus_OK(); -} - - -PyStatus +void _PyPreConfig_InitCompatConfig(PyPreConfig *config) { - size_t struct_size = config->struct_size; memset(config, 0, sizeof(*config)); - config->struct_size = struct_size; - - PyStatus status = preconfig_check_struct_size(config); - if (_PyStatus_EXCEPTION(status)) { - _PyStatus_UPDATE_FUNC(status); - return status; - } config->_config_init = (int)_PyConfig_INIT_COMPAT; config->parse_argv = 0; @@ -313,18 +294,13 @@ _PyPreConfig_InitCompatConfig(PyPreConfig *config) #ifdef MS_WINDOWS config->legacy_windows_fs_encoding = -1; #endif - return _PyStatus_OK(); } -PyStatus +void PyPreConfig_InitPythonConfig(PyPreConfig *config) { - PyStatus status = _PyPreConfig_InitCompatConfig(config); - if (_PyStatus_EXCEPTION(status)) { - _PyStatus_UPDATE_FUNC(status); - return status; - } + _PyPreConfig_InitCompatConfig(config); config->_config_init = (int)_PyConfig_INIT_PYTHON; config->isolated = 0; @@ -339,18 +315,13 @@ PyPreConfig_InitPythonConfig(PyPreConfig *config) #ifdef MS_WINDOWS config->legacy_windows_fs_encoding = 0; #endif - return _PyStatus_OK(); } -PyStatus +void PyPreConfig_InitIsolatedConfig(PyPreConfig *config) { - PyStatus status = _PyPreConfig_InitCompatConfig(config); - if (_PyStatus_EXCEPTION(status)) { - _PyStatus_UPDATE_FUNC(status); - return status; - } + _PyPreConfig_InitCompatConfig(config); config->_config_init = (int)_PyConfig_INIT_ISOLATED; config->configure_locale = 0; @@ -361,7 +332,6 @@ PyPreConfig_InitIsolatedConfig(PyPreConfig *config) #ifdef MS_WINDOWS config->legacy_windows_fs_encoding = 0; #endif - return _PyStatus_OK(); } @@ -369,47 +339,35 @@ PyStatus _PyPreConfig_InitFromPreConfig(PyPreConfig *config, const PyPreConfig *config2) { - PyStatus status = PyPreConfig_InitPythonConfig(config); - if (_PyStatus_EXCEPTION(status)) { - return status; - } - + PyPreConfig_InitPythonConfig(config); preconfig_copy(config, config2); return _PyStatus_OK(); } -PyStatus +void _PyPreConfig_InitFromConfig(PyPreConfig *preconfig, const PyConfig *config) { - PyStatus status; _PyConfigInitEnum config_init = (_PyConfigInitEnum)config->_config_init; switch (config_init) { case _PyConfig_INIT_PYTHON: - status = PyPreConfig_InitPythonConfig(preconfig); + PyPreConfig_InitPythonConfig(preconfig); break; case _PyConfig_INIT_ISOLATED: - status = PyPreConfig_InitIsolatedConfig(preconfig); + PyPreConfig_InitIsolatedConfig(preconfig); break; case _PyConfig_INIT_COMPAT: default: - status = _PyPreConfig_InitCompatConfig(preconfig); - } - - if (_PyStatus_EXCEPTION(status)) { - return status; + _PyPreConfig_InitCompatConfig(preconfig); } _PyPreConfig_GetConfig(preconfig, config); - return _PyStatus_OK(); } static void preconfig_copy(PyPreConfig *config, const PyPreConfig *config2) { - assert(config->struct_size == sizeof(PyPreConfig)); - #define COPY_ATTR(ATTR) config->ATTR = config2->ATTR COPY_ATTR(_config_init); @@ -829,12 +787,6 @@ _PyPreConfig_Read(PyPreConfig *config, const _PyArgv *args) return status; } - status = preconfig_check_struct_size(config); - if (_PyStatus_EXCEPTION(status)) { - _PyStatus_UPDATE_FUNC(status); - return status; - } - preconfig_get_global_vars(config); /* Copy LC_CTYPE locale, since it's modified later */ @@ -849,7 +801,6 @@ _PyPreConfig_Read(PyPreConfig *config, const _PyArgv *args) /* Save the config to be able to restore it if encodings change */ PyPreConfig save_config; - save_config.struct_size = sizeof(PyPreConfig); status = _PyPreConfig_InitFromPreConfig(&save_config, config); if (_PyStatus_EXCEPTION(status)) { @@ -976,7 +927,6 @@ PyStatus _PyPreConfig_Write(const PyPreConfig *src_config) { PyPreConfig config; - config.struct_size = sizeof(PyPreConfig); PyStatus status = _PyPreConfig_InitFromPreConfig(&config, src_config); if (_PyStatus_EXCEPTION(status)) { diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index c154d060ad8d..5174f749c68d 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -731,7 +731,6 @@ _Py_PreInitializeFromPyArgv(const PyPreConfig *src_config, const _PyArgv *args) runtime->preinitializing = 1; PyPreConfig config; - config.struct_size = sizeof(PyPreConfig); status = _PyPreConfig_InitFromPreConfig(&config, src_config); if (_PyStatus_EXCEPTION(status)) { @@ -795,12 +794,8 @@ _Py_PreInitializeFromConfig(const PyConfig *config, } PyPreConfig preconfig; - preconfig.struct_size = sizeof(PyPreConfig); - status = _PyPreConfig_InitFromConfig(&preconfig, config); - if (_PyStatus_EXCEPTION(status)) { - return status; - } + _PyPreConfig_InitFromConfig(&preconfig, config); if (!config->parse_argv) { return Py_PreInitialize(&preconfig); @@ -848,7 +843,6 @@ pyinit_core(_PyRuntimeState *runtime, } PyConfig config; - config.struct_size = sizeof(PyConfig); status = _PyConfig_InitCompatConfig(&config); if (_PyStatus_EXCEPTION(status)) { @@ -1076,7 +1070,6 @@ Py_InitializeEx(int install_sigs) } PyConfig config; - config.struct_size = sizeof(PyConfig); status = _PyConfig_InitCompatConfig(&config); if (_PyStatus_EXCEPTION(status)) { diff --git a/Python/pystate.c b/Python/pystate.c index f0662fa70657..098280d76dfc 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -61,11 +61,7 @@ _PyRuntimeState_Init_impl(_PyRuntimeState *runtime) _PyGC_Initialize(&runtime->gc); _PyEval_Initialize(&runtime->ceval); - runtime->preconfig.struct_size = sizeof(PyPreConfig); - PyStatus status = PyPreConfig_InitPythonConfig(&runtime->preconfig); - if (_PyStatus_EXCEPTION(status)) { - return status; - } + PyPreConfig_InitPythonConfig(&runtime->preconfig); runtime->gilstate.check_enabled = 1; @@ -210,7 +206,6 @@ PyInterpreterState_New(void) interp->id_refcount = -1; interp->check_interval = 100; - interp->config.struct_size = sizeof(PyConfig); PyStatus status = PyConfig_InitPythonConfig(&interp->config); if (_PyStatus_EXCEPTION(status)) { /* Don't report status to caller: PyConfig_InitPythonConfig()

1 0

bpo-38321: Fix _testcapimodule.c warning (GH-16494)
by Victor Stinner 30 Sep '19

30 Sep '19

https://github.com/python/cpython/commit/aca8c406ada3bb547765b262bed3ac0cc6… commit: aca8c406ada3bb547765b262bed3ac0cc6be8dd3 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-09-30T21:14:26+02:00 summary: bpo-38321: Fix _testcapimodule.c warning (GH-16494) Fix the following warning: modules\_testcapimodule.c(6409): warning C4146: unary minus operator applied to unsigned type, result still unsigned files: M Modules/_testcapimodule.c diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 30a786cd3455..3f3ed664880a 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -1952,7 +1952,7 @@ unicode_asutf8andsize(PyObject *self, PyObject *args) return NULL; } - buffer = PyUnicode_AsUTF8AndSize(unicode, &utf8_len); + buffer = PyUnicode_AsUTF8AndSize(unicode, &utf8_len); if (buffer == NULL) { return NULL; } @@ -6406,7 +6406,7 @@ static PyType_Spec HeapCTypeWithDict_spec = { static struct PyMemberDef heapctypewithnegativedict_members[] = { {"dictobj", T_OBJECT, offsetof(HeapCTypeWithDictObject, dict)}, - {"__dictoffset__", T_PYSSIZET, -sizeof(void*), READONLY}, + {"__dictoffset__", T_PYSSIZET, -(Py_ssize_t)sizeof(void*), READONLY}, {NULL} /* Sentinel */ };

1 0

(no subject)
by Łukasz Langa 30 Sep '19

30 Sep '19

To: python-checkins(a)python.org Subject: Clear weakrefs in garbage found by the GC (GH-16495) (#16499) Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 https://github.com/python/cpython/commit/92ca515ee1efbdc51678e12d105ad642c9… cc13 commit: 92ca515ee1efbdc51678e12d105ad642c9b9cc13 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.co= m> committer: =C5=81ukasz Langa <lukasz(a)langa.pl> date: 2019-09-30T19:27:46+02:00 summary: Clear weakrefs in garbage found by the GC (GH-16495) (#16499) Fix a bug due to the interaction of weakrefs and the cyclic garbage collector. We must clear any weakrefs in garbage in order to prevent their callbacks from executing and causing a crash. (cherry picked from commit bcda460baf25062ab68622b3f043f52b9db4d21d) Co-authored-by: Neil Schemenauer <nas-github(a)arctrix.com> files: A Misc/NEWS.d/next/Core and Builtins/2019-09-30-09-33-21.bpo-38006.UYlJum.rst M Modules/gcmodule.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-09-30-09-33-21.bpo-38006= .UYlJum.rst b/Misc/NEWS.d/next/Core and Builtins/2019-09-30-09-33-21.bpo-3800= 6.UYlJum.rst new file mode 100644 index 000000000000..c2dafae0afab --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-09-30-09-33-21.bpo-38006.UYlJum= .rst=09 @@ -0,0 +1,3 @@ +Fix a bug due to the interaction of weakrefs and the cyclic garbage +collector. We must clear any weakrefs in garbage in order to prevent their +callbacks from executing and causing a crash. diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index b2ee56623cd4..8bdbafef167e 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -678,6 +678,21 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old) op =3D FROM_GC(gc); next =3D GC_NEXT(gc); =20 + if (PyWeakref_Check(op)) { + /* A weakref inside the unreachable set must be cleared. If we + * allow its callback to execute inside delete_garbage(), it + * could expose objects that have tp_clear already called on + * them. Or, it could resurrect unreachable objects. One way + * this can happen is if some container objects do not implement + * tp_traverse. Then, wr_object can be outside the unreachable + * set but can be deallocated as a result of breaking the + * reference cycle. If we don't clear the weakref, the callback + * will run and potentially cause a crash. See bpo-38006 for + * one example. + */ + _PyWeakref_ClearRef((PyWeakReference *)op); + } + if (! PyType_SUPPORTS_WEAKREFS(Py_TYPE(op))) continue; =20 @@ -733,6 +748,8 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old) * is moved to wrcb_to_call in this case. */ if (gc_is_collecting(AS_GC(wr))) { + /* it should already have been cleared above */ + assert(wr->wr_object =3D=3D Py_None); continue; } =20

1 0

(no subject)
by Łukasz Langa 30 Sep '19

30 Sep '19

To: python-checkins(a)python.org Subject: Clear weakrefs in garbage found by the GC (#16495) Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 https://github.com/python/cpython/commit/bcda460baf25062ab68622b3f043f52b9d… d21d commit: bcda460baf25062ab68622b3f043f52b9db4d21d branch: master author: Neil Schemenauer <nas-github(a)arctrix.com> committer: =C5=81ukasz Langa <lukasz(a)langa.pl> date: 2019-09-30T19:06:45+02:00 summary: Clear weakrefs in garbage found by the GC (#16495) Fix a bug due to the interaction of weakrefs and the cyclic garbage collector. We must clear any weakrefs in garbage in order to prevent their callbacks from executing and causing a crash. files: A Misc/NEWS.d/next/Core and Builtins/2019-09-30-09-33-21.bpo-38006.UYlJum.rst M Modules/gcmodule.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-09-30-09-33-21.bpo-38006= .UYlJum.rst b/Misc/NEWS.d/next/Core and Builtins/2019-09-30-09-33-21.bpo-3800= 6.UYlJum.rst new file mode 100644 index 000000000000..c2dafae0afab --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-09-30-09-33-21.bpo-38006.UYlJum= .rst=09 @@ -0,0 +1,3 @@ +Fix a bug due to the interaction of weakrefs and the cyclic garbage +collector. We must clear any weakrefs in garbage in order to prevent their +callbacks from executing and causing a crash. diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index f6e841d52ff9..b95f676663a3 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -678,6 +678,21 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old) op =3D FROM_GC(gc); next =3D GC_NEXT(gc); =20 + if (PyWeakref_Check(op)) { + /* A weakref inside the unreachable set must be cleared. If we + * allow its callback to execute inside delete_garbage(), it + * could expose objects that have tp_clear already called on + * them. Or, it could resurrect unreachable objects. One way + * this can happen is if some container objects do not implement + * tp_traverse. Then, wr_object can be outside the unreachable + * set but can be deallocated as a result of breaking the + * reference cycle. If we don't clear the weakref, the callback + * will run and potentially cause a crash. See bpo-38006 for + * one example. + */ + _PyWeakref_ClearRef((PyWeakReference *)op); + } + if (! PyType_SUPPORTS_WEAKREFS(Py_TYPE(op))) continue; =20 @@ -733,6 +748,8 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old) * is moved to wrcb_to_call in this case. */ if (gc_is_collecting(AS_GC(wr))) { + /* it should already have been cleared above */ + assert(wr->wr_object =3D=3D Py_None); continue; } =20

1 0

bpo-38321: Fix PyCStructUnionType_update_stgdict() warning (GH-16492)
by Vinay Sajip 30 Sep '19

30 Sep '19

https://github.com/python/cpython/commit/c9a413ede47171a224c72dd34122005170… commit: c9a413ede47171a224c72dd34122005170caaad4 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2019-09-30T16:49:47+01:00 summary: bpo-38321: Fix PyCStructUnionType_update_stgdict() warning (GH-16492) bpo-22273, bpo-38321: Fix following warning: modules\_ctypes\stgdict.c(704): warning C4244: 'initializing': conversion from 'Py_ssize_t' to 'int', possible loss of data files: M Modules/_ctypes/stgdict.c diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c index 947e9c25592f..b794f10a2cb7 100644 --- a/Modules/_ctypes/stgdict.c +++ b/Modules/_ctypes/stgdict.c @@ -701,7 +701,7 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct assert(actual_type_index <= MAX_ELEMENTS); } else { - int length = dict->length; + Py_ssize_t length = dict->length; StgDictObject *edict; edict = PyType_stgdict(dict->proto);

1 0

bpo-38321: Fix _asynciomodule.c compiler warning (GH-16493)
by Victor Stinner 30 Sep '19

30 Sep '19

https://github.com/python/cpython/commit/efe74b6369a8d08f27c69703fcc1686966… commit: efe74b6369a8d08f27c69703fcc1686966e51068 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2019-09-30T16:41:34+02:00 summary: bpo-38321: Fix _asynciomodule.c compiler warning (GH-16493) bpo-38248, bpo-38321: Fix warning: modules\_asynciomodule.c(2667): warning C4102: 'set_exception': unreferenced label The related goto has been removed by commit edad4d89e357c92f70c0324b937845d652b20afd. files: M Modules/_asynciomodule.c diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c index 8ee0d7a7e14c..b67afd41768f 100644 --- a/Modules/_asynciomodule.c +++ b/Modules/_asynciomodule.c @@ -2657,7 +2657,6 @@ task_step_impl(TaskObj *task, PyObject *exc) /* Some other exception; pop it and call Task.set_exception() */ PyErr_Fetch(&et, &ev, &tb); -set_exception: assert(et); if (!ev || !PyObject_TypeCheck(ev, (PyTypeObject *) et)) { PyErr_NormalizeException(&et, &ev, &tb);

1 0

bpo-38322: Fix gotlandmark() of PC/getpathp.c (GH-16490)
by Victor Stinner 30 Sep '19

30 Sep '19

https://github.com/python/cpython/commit/18c4ba9f33868761e374a725d497902863… commit: 18c4ba9f33868761e374a725d497902863d59ea9 branch: 3.8 author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-09-30T14:49:42+02:00 summary: bpo-38322: Fix gotlandmark() of PC/getpathp.c (GH-16490) Write the filename into a temporary buffer instead of reusing prefix. The problem is that join() modifies prefix inplace. If prefix is not normalized, join() can make prefix shorter and so gotlandmark() does modify prefix instead of returning it unmodified. files: M PC/getpathp.c diff --git a/PC/getpathp.c b/PC/getpathp.c index 8bac592aefdb..04f24d986f66 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -315,15 +315,13 @@ canonicalize(wchar_t *buffer, const wchar_t *path) 'prefix' is null terminated in bounds. join() ensures 'landmark' can not overflow prefix if too long. */ static int -gotlandmark(wchar_t *prefix, const wchar_t *landmark) +gotlandmark(const wchar_t *prefix, const wchar_t *landmark) { - int ok; - Py_ssize_t n = wcsnlen_s(prefix, MAXPATHLEN); - - join(prefix, landmark); - ok = ismodule(prefix, FALSE); - prefix[n] = '\0'; - return ok; + wchar_t filename[MAXPATHLEN+1]; + memset(filename, 0, sizeof(filename)); + wcscpy_s(filename, Py_ARRAY_LENGTH(filename), prefix); + join(filename, landmark); + return ismodule(filename, FALSE); }

1 0

bpo-38322: Fix gotlandmark() of PC/getpathp.c (GH-16489)
by Victor Stinner 30 Sep '19

30 Sep '19

https://github.com/python/cpython/commit/dec39716ca93ee2e8d9b94915ece33014e… commit: dec39716ca93ee2e8d9b94915ece33014eb58e9e branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-09-30T14:49:34+02:00 summary: bpo-38322: Fix gotlandmark() of PC/getpathp.c (GH-16489) Write the filename into a temporary buffer instead of reusing prefix. The problem is that join() modifies prefix inplace. If prefix is not normalized, join() can make prefix shorter and so gotlandmark() does modify prefix instead of returning it unmodified. files: M PC/getpathp.c diff --git a/PC/getpathp.c b/PC/getpathp.c index 8bac592aefdb..04f24d986f66 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -315,15 +315,13 @@ canonicalize(wchar_t *buffer, const wchar_t *path) 'prefix' is null terminated in bounds. join() ensures 'landmark' can not overflow prefix if too long. */ static int -gotlandmark(wchar_t *prefix, const wchar_t *landmark) +gotlandmark(const wchar_t *prefix, const wchar_t *landmark) { - int ok; - Py_ssize_t n = wcsnlen_s(prefix, MAXPATHLEN); - - join(prefix, landmark); - ok = ismodule(prefix, FALSE); - prefix[n] = '\0'; - return ok; + wchar_t filename[MAXPATHLEN+1]; + memset(filename, 0, sizeof(filename)); + wcscpy_s(filename, Py_ARRAY_LENGTH(filename), prefix); + join(filename, landmark); + return ismodule(filename, FALSE); }

1 0

bpo-38304: Fix PyConfig usage in python_uwp.cpp (GH-16488)
by Victor Stinner 30 Sep '19

30 Sep '19

https://github.com/python/cpython/commit/81f6b031c46721478372d77fe2e55aa1f8… commit: 81f6b031c46721478372d77fe2e55aa1f8300ae1 branch: 3.8 author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2019-09-30T12:53:17+02:00 summary: bpo-38304: Fix PyConfig usage in python_uwp.cpp (GH-16488) * Set PyPreConfig.struct_size and PyConfig.struct_size as required by the API. * PyPreConfig_InitPythonConfig() can now fail: check PyStatus result. files: M PC/python_uwp.cpp diff --git a/PC/python_uwp.cpp b/PC/python_uwp.cpp index 06c1dd353655..2656d188c250 100644 --- a/PC/python_uwp.cpp +++ b/PC/python_uwp.cpp @@ -167,7 +167,10 @@ wmain(int argc, wchar_t **argv) PyStatus status; PyPreConfig preconfig; + preconfig.struct_size = sizeof(PyPreConfig); + PyConfig config; + config.struct_size = sizeof(PyConfig); const wchar_t *moduleName = NULL; const wchar_t *p = wcsrchr(argv[0], L'\\'); @@ -186,7 +189,10 @@ wmain(int argc, wchar_t **argv) } } - PyPreConfig_InitPythonConfig(&preconfig); + status = PyPreConfig_InitPythonConfig(&preconfig); + if (PyStatus_Exception(status)) { + goto fail_without_config; + } if (!moduleName) { status = Py_PreInitializeFromArgs(&preconfig, argc, argv); if (PyStatus_Exception(status)) {

1 0

bpo-38304: Fix PyConfig usage in python_uwp.cpp (GH-16487)
by Victor Stinner 30 Sep '19

30 Sep '19

https://github.com/python/cpython/commit/89f8177dcfdbcf17c85bb6998c946c9f42… commit: 89f8177dcfdbcf17c85bb6998c946c9f42bf6e27 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2019-09-30T12:52:29+02:00 summary: bpo-38304: Fix PyConfig usage in python_uwp.cpp (GH-16487) * Set PyPreConfig.struct_size and PyConfig.struct_size as required by the API. * PyPreConfig_InitPythonConfig() can now fail: check PyStatus result. files: M PC/python_uwp.cpp diff --git a/PC/python_uwp.cpp b/PC/python_uwp.cpp index 06c1dd353655..2656d188c250 100644 --- a/PC/python_uwp.cpp +++ b/PC/python_uwp.cpp @@ -167,7 +167,10 @@ wmain(int argc, wchar_t **argv) PyStatus status; PyPreConfig preconfig; + preconfig.struct_size = sizeof(PyPreConfig); + PyConfig config; + config.struct_size = sizeof(PyConfig); const wchar_t *moduleName = NULL; const wchar_t *p = wcsrchr(argv[0], L'\\'); @@ -186,7 +189,10 @@ wmain(int argc, wchar_t **argv) } } - PyPreConfig_InitPythonConfig(&preconfig); + status = PyPreConfig_InitPythonConfig(&preconfig); + if (PyStatus_Exception(status)) { + goto fail_without_config; + } if (!moduleName) { status = Py_PreInitializeFromArgs(&preconfig, argc, argv); if (PyStatus_Exception(status)) {

1 0