Skip to content

bpo-40887: Fix finalize_interp_clear() for free lists #20698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Jun 7, 2020
+17 −27
Merged

bpo-40887: Fix finalize_interp_clear() for free lists #20698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 17 additions & 27 deletions Python/pylifecycle.c
View file
Open in desktop
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