diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | eval_error.c | 6 | ||||
-rw-r--r-- | test/ruby/test_beginendblock.rb | 16 |
3 files changed, 29 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Mon Jun 21 23:41:08 2010 wanabe <s.wanabe@gmail.com> + + * eval_error.c (error_print): clear raised_flag while error-printing + to avoid hang. [ruby-core:27608] + + * test/ruby/test_beginendblock.rb (test_endblock_raise): add test for + above. + Sun Jun 20 16:17:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * id.c (Init_id): add underscore name. diff --git a/eval_error.c b/eval_error.c index 46a0705f4a..41fcbb0abb 100644 --- a/eval_error.c +++ b/eval_error.c @@ -67,13 +67,16 @@ static void error_print(void) { volatile VALUE errat = Qnil; /* OK */ - VALUE errinfo = GET_THREAD()->errinfo; + rb_thread_t *th = GET_THREAD(); + VALUE errinfo = th->errinfo; + int raised_flag = th->raised_flag; volatile VALUE eclass, e; const char *volatile einfo; volatile long elen; if (NIL_P(errinfo)) return; + rb_thread_raised_clear(th); PUSH_TAG(); if (EXEC_TAG() == 0) { @@ -179,6 +182,7 @@ error_print(void) } error: POP_TAG(); + rb_thread_raised_set(th, raised_flag); } void diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index dd72ac8101..0540f5df1c 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -108,4 +108,20 @@ EOW assert_nil $?.exitstatus assert_equal Signal.list["INT"], $?.termsig end + + def test_endblock_raise + ruby = EnvUtil.rubybin + out = IO.popen( + [ruby, + '-e', 'class C; def write(x); puts x; STDOUT.flush; sleep 0.01; end; end', + '-e', '$stderr = C.new', + '-e', 'END {raise "e1"}; END {puts "e2"}', + '-e', 'END {raise "e3"}; END {puts "e4"}', + '-e', 'END {raise "e5"}; END {puts "e6"}']) {|f| + Thread.new {sleep 5; Process.kill :KILL, f.pid} + f.read + } + assert_match(/e1/, out) + assert_match(/e6/, out) + end end |