summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-16 23:03:54 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-16 23:03:54 +0000
commit8addee964963725695f59184281810b7d6956713 (patch)
treeec93948cd877b6225b3c0865a5c4e4501adacc81
parent199fc6a54f8890c1935e797d5ef09a529bb5391b (diff)
* thread.c (rb_threadptr_interrupt_mask): fix to check interrupt
after interrupt_mask changed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 45a2cee99e..cf5ccd1995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 17 08:02:57 2012 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c (rb_threadptr_interrupt_mask): fix to check interrupt
+ after interrupt_mask changed.
+
Wed Oct 17 06:42:47 2012 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (vm_call_method): fix to return value immediately.
diff --git a/thread.c b/thread.c
index 035ccebd7d..4b750b4dcc 100644
--- a/thread.c
+++ b/thread.c
@@ -1508,6 +1508,8 @@ rb_threadptr_interrupt_mask(rb_thread_t *th, VALUE mask, VALUE (*func)(rb_thread
JUMP_TAG(state);
}
+ RUBY_VM_CHECK_INTS(th);
+
return r;
}