mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-38631: Avoid Py_FatalError() in PyModule_Create2() (GH-18212)

Browse source 
If PyModule_Create2() is called when the Python import machinery is
not initialized, it now raises a SystemError and returns NULL,
instead of calling Py_FatalError() which aborts the process.

The caller must be prepared to handle NULL anyway.
This commit is contained in:
Victor Stinner 2020-01-27 22:37:05 +01:00 • committed by GitHub
parent 4a46adc774
commit a94c6b61aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/moduleobject.c
View file

@ -173,8 +173,11 @@ _add_methods_to_object(PyObject *module, PyObject *name, PyMethodDef *functions)
PyObject * PyObject *
PyModule_Create2(struct PyModuleDef* module, int module_api_version) PyModule_Create2(struct PyModuleDef* module, int module_api_version)
{ {
if (!_PyImport_IsInitialized(_PyInterpreterState_Get())) if (!_PyImport_IsInitialized(_PyInterpreterState_Get())) {
Py_FatalError("Python import machinery not initialized"); PyErr_SetString(PyExc_SystemError,
"Python import machinery not initialized");
return NULL;
}
return _PyModule_CreateInitialized(module, module_api_version); return _PyModule_CreateInitialized(module, module_api_version);
} }