mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-35993: Fix _PyInterpreterState_DeleteExceptMain() (GH-11852) 

Fix a crash on fork when using subinterpreters.
This commit is contained in:
Stéphane Wirtel 2019-02-20 15:27:22 +01:00 committed by Victor Stinner
parent 001fee14e0
commit b5409dacc4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2019-02-14-09-17-54.bpo-35993.Bvm3fP.rst Normal file
View File

@ -0,0 +1 @@
Fix a crash on fork when using subinterpreters. Contributed by Stéphane Wirtel

7
Python/pystate.c
View File

@ -281,10 +281,11 @@ _PyInterpreterState_DeleteExceptMain()
HEAD_LOCK(); HEAD_LOCK();
PyInterpreterState *interp = _PyRuntime.interpreters.head; PyInterpreterState *interp = _PyRuntime.interpreters.head;
_PyRuntime.interpreters.head = NULL; _PyRuntime.interpreters.head = NULL;
for (; interp != NULL; interp = interp->next) { while (interp != NULL) {
if (interp == _PyRuntime.interpreters.main) { if (interp == _PyRuntime.interpreters.main) {
_PyRuntime.interpreters.main->next = NULL; _PyRuntime.interpreters.main->next = NULL;
_PyRuntime.interpreters.head = interp; _PyRuntime.interpreters.head = interp;
interp = interp->next;
continue; continue;
} }
@ -293,7 +294,9 @@ _PyInterpreterState_DeleteExceptMain()
if (interp->id_mutex != NULL) { if (interp->id_mutex != NULL) {
PyThread_free_lock(interp->id_mutex); PyThread_free_lock(interp->id_mutex);
} }
PyMem_RawFree(interp); PyInterpreterState *prev_interp = interp;
interp = interp->next;
PyMem_RawFree(prev_interp);
} }
HEAD_UNLOCK(); HEAD_UNLOCK();