kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* thread.c (thread_start_func_2): propagates fatal error and system

Browse source 
exit to the main thread.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-08-05 21:55:23 +00:00
parent c97a842391
commit 3af2559d17
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Aug 6 06:55:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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 <nobu@ruby-lang.org> Wed Aug 6 05:31:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_to_encoding_index, rb_to_encoding): check if the name * encoding.c (rb_to_encoding_index, rb_to_encoding): check if the name

24
thread.c
View file

@ -382,11 +382,25 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
}); });
} }
else { else {
if (th->safe_level < 4 && errinfo = th->errinfo;
(th->vm->thread_abort_on_exception || if (NIL_P(errinfo)) errinfo = rb_errinfo();
th->abort_on_exception || RTEST(ruby_debug))) { if (state == TAG_FATAL) {
errinfo = th->errinfo; /* fatal error within this thread, need to stop whole script */
if (NIL_P(errinfo)) errinfo = rb_errinfo(); }
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; th->value = Qnil;
} }