summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-19 06:54:35 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-19 06:54:35 +0000
commit95273072a7d9675b6997791410a5fb3a244fd580 (patch)
tree1302cba4d2672be3c555f50612133894e5e3b363
parent7ae65d012130249b24e3a88ee3cfd82d0f2ef735 (diff)
* signal.c: should also clear ruby_disable_gc.
[Bug #11692] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--signal.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8e877077c..7481ca3121 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 19 15:53:21 2015 Koichi Sasada <ko1@atdot.net>
+
+ * signal.c: should also clear ruby_disable_gc.
+ [Bug #11692]
+
Thu Nov 19 15:31:45 2015 Koichi Sasada <ko1@atdot.net>
* compile.c (iseq_compile_each): T_IMEMO/iseq objects should be
diff --git a/signal.c b/signal.c
index 9b3153d99d..d413bac38c 100644
--- a/signal.c
+++ b/signal.c
@@ -752,7 +752,7 @@ rb_get_next_signal(void)
#if defined SIGSEGV || defined SIGBUS || defined SIGILL || defined SIGFPE
static const char *received_signal;
-# define clear_received_signal() (void)(received_signal = 0)
+# define clear_received_signal() (void)(ruby_disable_gc = 0, received_signal = 0)
#else
# define clear_received_signal() ((void)0)
#endif