kosaki	2012-11-29 06:54:52 +0900 (Thu, 29 Nov 2012)

  New Revision: 37953

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37953

  Log:
    * thread.c (thread_start_func_2): remove unused code. security
      level is checked before rb_eSecurityError raises.

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37952)
+++ ChangeLog	(revision 37953)
@@ -1,3 +1,8 @@
+Thu Nov 29 06:24:15 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* thread.c (thread_start_func_2): remove unused code. security
+	  level is checked before rb_eSecurityError raises.
+
 Thu Nov 29 05:26:32 2012  Koichi Sasada  <ko1@a...>
 
 	* vm_backtrace.c (backtrace_to_str_ary2): rename to backtrace_to_str_ary.
Index: thread.c
===================================================================
--- thread.c	(revision 37952)
+++ thread.c	(revision 37953)
@@ -489,16 +489,8 @@
 	    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))) {
+	    else if (th->vm->thread_abort_on_exception ||
+		     th->abort_on_exception || RTEST(ruby_debug)) {
 		/* exit on main_thread */
 	    }
 	    else {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/