From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 10 Jan 2012 21:44:11 +0000 (+0100)
Subject: Fix _PyFaulthandler_Fini() so it can be called before _PyFaulthandler_Init()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1134b0dbbd3fa2afe5ea3989ea3b0d4f4682a4ef;p=python

Fix _PyFaulthandler_Fini() so it can be called before _PyFaulthandler_Init()
---

diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index 51c66bdd65..fcf4d01239 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -1282,8 +1282,8 @@ void _PyFaulthandler_Fini(void)
 
 #ifdef FAULTHANDLER_LATER
     /* later */
-    cancel_dump_tracebacks_later();
     if (thread.cancel_event) {
+        cancel_dump_tracebacks_later();
         PyThread_release_lock(thread.cancel_event);
         PyThread_free_lock(thread.cancel_event);
         thread.cancel_event = NULL;
@@ -1296,8 +1296,8 @@ void _PyFaulthandler_Fini(void)
 
 #ifdef FAULTHANDLER_WATCHDOG
     /* file watchdog */
-    cancel_file_watchdog();
     if (watchdog.cancel_event) {
+        cancel_file_watchdog();
         PyThread_release_lock(watchdog.cancel_event);
         PyThread_free_lock(watchdog.cancel_event);
         watchdog.cancel_event = NULL;