mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 19:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-36854: Fix refleak in subinterpreter (GH-17331)

Browse source 
finalize_interp_clear() now explicitly clears the codec registry and
then trigger a GC collection to clear all references.
This commit is contained in:
Victor Stinner 2019-11-22 10:58:00 +01:00 • committed by GitHub
parent 91daa9d722
commit 310e2d2517
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Modules/_testcapimodule.c
View file

@ -6721,11 +6721,14 @@ PyInit__testcapi(void)
PyModule_AddObject(m, "instancemethod", (PyObject *)&PyInstanceMethod_Type); PyModule_AddObject(m, "instancemethod", (PyObject *)&PyInstanceMethod_Type);
PyModule_AddIntConstant(m, "the_number_three", 3); PyModule_AddIntConstant(m, "the_number_three", 3);
PyObject *v;
#ifdef WITH_PYMALLOC #ifdef WITH_PYMALLOC
PyModule_AddObject(m, "WITH_PYMALLOC", Py_True); v = Py_True;
#else #else
PyModule_AddObject(m, "WITH_PYMALLOC", Py_False); v = Py_False;
#endif #endif
Py_INCREF(v);
PyModule_AddObject(m, "WITH_PYMALLOC", v);
TestError = PyErr_NewException("_testcapi.error", NULL, NULL); TestError = PyErr_NewException("_testcapi.error", NULL, NULL);
Py_INCREF(TestError); Py_INCREF(TestError);

8
Python/pylifecycle.c
View file

@ -1210,6 +1210,14 @@ finalize_interp_clear(PyThreadState *tstate)
{ {
int is_main_interp = _Py_IsMainInterpreter(tstate); int is_main_interp = _Py_IsMainInterpreter(tstate);
/* bpo-36854: Explicitly clear the codec registry
and trigger a GC collection */
PyInterpreterState *interp = tstate->interp;
Py_CLEAR(interp->codec_search_path);
Py_CLEAR(interp->codec_search_cache);
Py_CLEAR(interp->codec_error_registry);
_PyGC_CollectNoFail();
/* Clear interpreter state and all thread states */ /* Clear interpreter state and all thread states */
PyInterpreterState_Clear(tstate->interp); PyInterpreterState_Clear(tstate->interp);