aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-13 07:38:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-13 07:38:23 +0000
commit8f18aa06c8b4c2d8700ccd514368384dc39c7610 (patch)
tree5368756931ec0ec09500e048402f0efed1b9ab2a
parentc3bbc818af54ecf70933c04aad10c3e0d140926f (diff)
downloadruby-8f18aa06c8b4c2d8700ccd514368384dc39c7610.tar.gz
thread.c: disable VM events when stack overflow
* thread.c (ruby_thread_stack_overflow): disable VM events when stack overflow occurred; it causes another stack overflow again in making backtrace object, and crashes. [ruby-core:80662] [Bug #13425] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_trace.rb15
-rw-r--r--thread.c1
2 files changed, 16 insertions, 0 deletions
diff --git a/test/ruby/test_trace.rb b/test/ruby/test_trace.rb
index 77be94e9be..0be545e515 100644
--- a/test/ruby/test_trace.rb
+++ b/test/ruby/test_trace.rb
@@ -59,4 +59,19 @@ class TestTrace < Test::Unit::TestCase
a.any? {true}
}.value, bug2722)
end
+
+ def test_trace_stackoverflow
+ assert_normal_exit("#{<<-"begin;"}\n#{<<~"end;"}")
+ begin;
+ require 'tracer'
+ class HogeError < StandardError
+ def to_s
+ message.upcase # disable tailcall optimization
+ end
+ end
+ Tracer.stdout = open(IO::NULL, "w")
+ Tracer.on
+ HogeError.new.to_s
+ end;
+ end
end
diff --git a/thread.c b/thread.c
index a93c6100bf..54b4fd599c 100644
--- a/thread.c
+++ b/thread.c
@@ -2169,6 +2169,7 @@ NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
void
ruby_thread_stack_overflow(rb_thread_t *th)
{
+ ruby_vm_event_flags = 0;
th->raised_flag = 0;
#ifdef USE_SIGALTSTACK
if (!rb_threadptr_during_gc(th)) {