mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

#4236: avoid possible Fatal Error when import is called from __del__

Browse source 
Patch by Simon Cross, crasher test code by Martin von Löwis.
This commit is contained in:
R. David Murray 2010-12-14 23:06:25 +00:00
parent 95333e3aa9
commit ce4b170c5a
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Objects/moduleobject.c
View file

@ -63,8 +63,9 @@ PyModule_Create2(struct PyModuleDef* module, int module_api_version)
PyMethodDef *ml;
const char* name;
PyModuleObject *m;
if (!Py_IsInitialized())
Py_FatalError("Interpreter not initialized (version mismatch?)");
PyInterpreterState *interp = PyThreadState_Get()->interp;
if (interp->modules == NULL)
Py_FatalError("Python import machinery not initialized");
if (PyType_Ready(&moduledef_type) < 0)
return NULL;
if (module->m_base.m_index == 0) {