summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-12 05:08:28 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-12 05:08:28 +0000
commitc307523565e0a8815bfd0d7deeed8b9ae7796e16 (patch)
tree691e3a1097e18ec5971396e4f5669197121b2c3e
parent89e2951bde9b7f4e04a8f068bfde6756aebf74af (diff)
* signal.c (install_sighandler): fixed a race.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--signal.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b17b133f7c..bb7a132b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 12 14:07:46 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * signal.c (install_sighandler): fixed a race.
+
Tue Jul 12 13:49:32 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* signal.c (sig_trap): don't permit to change a signal handler which
diff --git a/signal.c b/signal.c
index 7490de9f82..d98aa03b53 100644
--- a/signal.c
+++ b/signal.c
@@ -1008,10 +1008,12 @@ install_sighandler(int signum, sighandler_t handler)
{
sighandler_t old;
+ rb_disable_interrupt();
old = ruby_signal(signum, handler);
if (old != SIG_DFL) {
ruby_signal(signum, old);
}
+ rb_enable_interrupt();
}
#if defined(SIGCLD) || defined(SIGCHLD)