commit c0bc4eff5093bd4268cb3d02b9dca2fcbe7e59ca
author Benjamin Peterson <benjamin@python.org> Mon Jun 16 19:39:18 2014 -0700
committer Benjamin Peterson <benjamin@python.org> Mon Jun 16 19:39:18 2014 -0700
tree 9a2ee96173bee1404d002fe5e53c86fd6d2193aa
parent 1a6561e2f593143565a6562e7818ea735d2b6790

avoid crashes and lockups from daemon threads during interpreter shutdown (#1856)

Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index 18bc66b..b1f5e8e 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -355,6 +355,12 @@
     if (interpreter_lock) {
         int err = errno;
         PyThread_acquire_lock(interpreter_lock, 1);
+        /* _Py_Finalizing is protected by the GIL */
+        if (_Py_Finalizing && tstate != _Py_Finalizing) {
+            PyThread_release_lock(interpreter_lock);
+            PyThread_exit_thread();
+            assert(0);  /* unreachable */
+        }
         errno = err;
     }
 #endif