From 9463e3ac8b230efa2f35e08859cb3db5c6d192b7 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Sat, 10 Nov 2012 20:33:07 -0800 Subject: Fixes issue #9535: Fix pending signals that have been received but not yet handled by Python to not persist after os.fork() in the child process. --- Misc/NEWS | 3 +++ Modules/signalmodule.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index ab18f03..6a97cbc 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 3.2.4 Core and Builtins ----------------- +- Issue #9535: Fix pending signals that have been received but not yet + handled by Python to not persist after os.fork() in the child process. + - Issue #15001: fix segfault on "del sys.module['__main__']". Patch by Victor Stinner. diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 32cd8bb..9cae454 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -987,9 +987,25 @@ PyOS_InterruptOccurred(void) return 0; } +static void +_clear_pending_signals(void) +{ + int i; + if (!is_tripped) + return; + is_tripped = 0; + for (i = 1; i < NSIG; ++i) { + Handlers[i].tripped = 0; + } +} + void PyOS_AfterFork(void) { + /* Clear the signal flags after forking so that they aren't handled + * in both processes if they came in just before the fork() but before + * the interpreter had an opportunity to call the handlers. issue9535. */ + _clear_pending_signals(); #ifdef WITH_THREAD /* PyThread_ReInitTLS() must be called early, to make sure that the TLS API * can be called safely. */ -- cgit v0.12