diff options
| author | Jason Fried <me@jasonfried.info> | 2017-05-22 23:58:55 (GMT) |
|---|---|---|
| committer | Łukasz Langa <lukasz@langa.pl> | 2017-05-22 23:58:55 (GMT) |
| commit | f82c951d1c5416f3550d544e50ff5662d3836e73 (patch) | |
| tree | 3eece5da20e79b1c3376d0186dda931a9951c515 | |
| parent | 1b9530c536664276ce866ae602ce04adce0810e1 (diff) | |
| download | cpython-f82c951d1c5416f3550d544e50ff5662d3836e73.zip cpython-f82c951d1c5416f3550d544e50ff5662d3836e73.tar.gz cpython-f82c951d1c5416f3550d544e50ff5662d3836e73.tar.bz2 | |
bpo-30395 _PyGILState_Reinit deadlock fix (#1734)
head_lock could be held by another thread when fork happened. We should
reset it to avoid deadlock.
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Python/pystate.c | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -556,6 +556,7 @@ Eric Groo Daniel Andrade Groppe Dag Gruneau Filip Gruszczyński +Andrii Grynenko Grzegorz Grzywacz Thomas Guettler Yuyang Guo diff --git a/Python/pystate.c b/Python/pystate.c index 8e81707..52899f1 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -744,6 +744,10 @@ _PyGILState_Fini(void) void _PyGILState_Reinit(void) { +#ifdef WITH_THREAD + head_mutex = NULL; + HEAD_INIT(); +#endif PyThreadState *tstate = PyGILState_GetThisThreadState(); PyThread_delete_key(autoTLSkey); if ((autoTLSkey = PyThread_create_key()) == -1) |