mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Issue #10241: Clear extension module dict copies at interpreter shutdown.
Patch by Neil Schemenauer, minimally modified. (re-apply after fix for tkinter-related crash)
This commit is contained in:
parent
584e815114
commit
40322e6ad5
4 changed files with 33 additions and 0 deletions
|
@ -320,6 +320,31 @@ PyState_RemoveModule(struct PyModuleDef* def)
|
|||
return PyList_SetItem(state->modules_by_index, index, Py_None);
|
||||
}
|
||||
|
||||
/* used by import.c:PyImport_Cleanup */
|
||||
void
|
||||
_PyState_ClearModules(void)
|
||||
{
|
||||
PyInterpreterState *state = PyThreadState_GET()->interp;
|
||||
if (state->modules_by_index) {
|
||||
Py_ssize_t i;
|
||||
for (i = 0; i < PyList_GET_SIZE(state->modules_by_index); i++) {
|
||||
PyObject *m = PyList_GET_ITEM(state->modules_by_index, i);
|
||||
if (PyModule_Check(m)) {
|
||||
/* cleanup the saved copy of module dicts */
|
||||
PyModuleDef *md = PyModule_GetDef(m);
|
||||
if (md)
|
||||
Py_CLEAR(md->m_base.m_copy);
|
||||
}
|
||||
}
|
||||
/* Setting modules_by_index to NULL could be dangerous, so we
|
||||
clear the list instead. */
|
||||
if (PyList_SetSlice(state->modules_by_index,
|
||||
0, PyList_GET_SIZE(state->modules_by_index),
|
||||
NULL))
|
||||
PyErr_WriteUnraisable(state->modules_by_index);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
PyThreadState_Clear(PyThreadState *tstate)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue