From b37513c1d5b5cca4528d421dfc0251175195929f Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 5 Aug 2008 21:55:23 +0000 Subject: * thread.c (thread_start_func_2): propagates fatal error and system exit to the main thread. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread.c | 24 +++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08befcccf..093dc337a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 6 06:55:20 2008 Nobuyoshi Nakada + + * thread.c (thread_start_func_2): propagates fatal error and system + exit to the main thread. + Wed Aug 6 05:31:54 2008 Nobuyoshi Nakada * encoding.c (rb_to_encoding_index, rb_to_encoding): check if the name diff --git a/thread.c b/thread.c index 1650b9b4c..ffa3fce47 100644 --- a/thread.c +++ b/thread.c @@ -382,11 +382,25 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s }); } else { - if (th->safe_level < 4 && - (th->vm->thread_abort_on_exception || - th->abort_on_exception || RTEST(ruby_debug))) { - errinfo = th->errinfo; - if (NIL_P(errinfo)) errinfo = rb_errinfo(); + errinfo = th->errinfo; + if (NIL_P(errinfo)) errinfo = rb_errinfo(); + if (state == TAG_FATAL) { + /* fatal error within this thread, need to stop whole script */ + } + else if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) { + if (th->safe_level >= 4) { + th->errinfo = rb_exc_new3(rb_eSecurityError, + rb_sprintf("Insecure exit at level %d", th->safe_level)); + errinfo = Qnil; + } + } + else if (th->safe_level < 4 && + (th->vm->thread_abort_on_exception || + th->abort_on_exception || RTEST(ruby_debug))) { + /* exit on main_thread */ + } + else { + errinfo = Qnil; } th->value = Qnil; } -- cgit