diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | thread.c | 15 |
2 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,9 @@ +Thu Nov 29 11:06:06 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * thread.c (thread_start_func_2): remove unused code. When + th->safe_level == 4, th->errinfo never be thrown. So, to + create new exception makes no sense. + Thu Nov 29 10:29:53 2012 Koichi Sasada <ko1@atdot.net> * vm_backtrace.c: same as a last patch. @@ -491,16 +491,15 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s if (state == TAG_FATAL) { /* fatal error within this thread, need to stop whole script */ } + else if (th->safe_level >= 4) { + /* Ignore it. Main thread shouldn't be harmed from untrusted thread. */ + errinfo = Qnil; + } 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; - } + /* exit on main_thread. */ } - else if (th->safe_level < 4 && - (th->vm->thread_abort_on_exception || - th->abort_on_exception || RTEST(ruby_debug))) { + else if (th->vm->thread_abort_on_exception || + th->abort_on_exception || RTEST(ruby_debug)) { /* exit on main_thread */ } else { |