diff options
| author | Gregory P. Smith <greg@krypto.org> | 2012-11-11 04:33:07 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2012-11-11 04:33:07 (GMT) |
| commit | 9463e3ac8b230efa2f35e08859cb3db5c6d192b7 (patch) | |
| tree | 5949203b8d12a797626fb444ca4ec8b98006a72a | |
| parent | 7ee955550b27af117ddca61deb061e13423cf24b (diff) | |
| download | cpython-9463e3ac8b230efa2f35e08859cb3db5c6d192b7.zip cpython-9463e3ac8b230efa2f35e08859cb3db5c6d192b7.tar.gz cpython-9463e3ac8b230efa2f35e08859cb3db5c6d192b7.tar.bz2 | |
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.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 16 |
2 files changed, 19 insertions, 0 deletions
@@ -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. */ |