Skip to content

Commit

Permalink
bpo-40887: Fix finalize_interp_clear() for free lists (GH-20698)
Browse files Browse the repository at this point in the history
Reorganize code to ensure that free lists are cleared in the right
order. Call _PyWarnings_Fini() before _PyList_Fini().
  • Loading branch information
vstinner committed Jun 7, 2020
1 parent 2efe18b commit 7907f8c
Showing 1 changed file with 17 additions and 27 deletions.
44 changes: 17 additions & 27 deletions Python/pylifecycle.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,37 +1250,26 @@ static void
finalize_interp_types(PyThreadState *tstate, int is_main_interp)
{
_PyFrame_Fini(tstate);
_PyTuple_Fini(tstate);
_PyList_Fini(tstate);
_PyAsyncGen_Fini(tstate);
_PyContext_Fini(tstate);

if (is_main_interp) {
_PySet_Fini();
_PyBytes_Fini();
}

_PyLong_Fini(tstate);
_PyFloat_Fini(tstate);

if (is_main_interp) {
_PyDict_Fini();
}
_PyList_Fini(tstate);
_PyTuple_Fini(tstate);

_PySlice_Fini(tstate);
_PyWarnings_Fini(tstate->interp);

if (is_main_interp) {
_Py_HashRandomization_Fini();
_PyArg_Fini();
_PyBytes_Fini();
}

_PyAsyncGen_Fini(tstate);
_PyContext_Fini(tstate);

/* Cleanup Unicode implementation */
_PyUnicode_Fini(tstate);

if (is_main_interp) {
_Py_ClearFileSystemEncoding();
}
_PyFloat_Fini(tstate);
_PyLong_Fini(tstate);
}


Expand All @@ -1299,19 +1288,20 @@ finalize_interp_clear(PyThreadState *tstate)

_PyGC_Fini(tstate);

finalize_interp_types(tstate, is_main_interp);

if (is_main_interp) {
/* XXX Still allocated:
- various static ad-hoc pointers to interned strings
- int and float free list blocks
- whatever various modules and libraries allocate
*/
_Py_HashRandomization_Fini();
_PyArg_Fini();
_Py_ClearFileSystemEncoding();
}

PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
_PyWarnings_Fini(tstate->interp);

if (is_main_interp) {
PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
_PyExc_Fini();
}

finalize_interp_types(tstate, is_main_interp);
}


Expand Down

0 comments on commit 7907f8c

Please sign in to comment.