* signal.c (sighandle): should not re-register sighandler if

  POSIX_SIGNAL is defined.

* eval.c (error_print): errat array may be empty.

* eval.c (rb_eval_cmd): should not upgrade safe level unless
  explicitly specified by argument newly added.

* signal.c (sig_trap): should not allow tainted trap closure.

* variable.c (rb_f_trace_var): should not allow trace_var on safe
  level higher than 3.

* variable.c (rb_f_trace_var): should not allow tainted trace
  closure.

* gc.c: do not use static stack until system stack overflows.

* eval.c (eval): should call Exception#exception instead of
  calling rb_exc_new3() directly.

* error.c (exc_exception): set "mesg" directly to the clone.  it
  might be better to set mesg via some method for flexibility.

* variable.c (cvar_override_check): should print original module
  name, if 'a' is T_ICLASS.

* parse.y (yylex): float '1_.0' should not be allowed.

* variable.c (var_getter): should care about var as Qfalse
  (ruby-bugs#PR199).

* array.c (cmpint): <=> or block for {min,max} may return bignum.

* array.c (sort_1): use rb_compint.

* array.c (sort_2): ditto.

* enum.c (min_ii): ditto.

* enum.c (min_ii): ditto.

* enum.c (max_i): ditto.

* enum.c (max_ii): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 2 deletions

diff --git a/signal.c b/signal.c
index 57e70024de..d20e5dcf75 100644
--- a/signal.c
+++ b/signal.c
@@ -355,7 +355,7 @@ sighandle(sig)
 	rb_bug("trap_handler: Bad signal %d", sig);
     }
 
-#if !defined(BSD_SIGNAL)
+#if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL)
     ruby_signal(sig, sighandle);
 #endif
 
@@ -407,7 +407,7 @@ rb_trap_exit()
 	VALUE trap_exit = trap_list[0];
 
 	trap_list[0] = 0;
-	rb_eval_cmd(trap_exit, rb_ary_new3(1, INT2FIX(0)));
+	rb_eval_cmd(trap_exit, rb_ary_new3(1, INT2FIX(0)), 0);
     }
 #endif
 }
@@ -628,6 +628,9 @@ sig_trap(argc, argv)
 	arg.cmd = argv[1];
     }
 
+    if (OBJ_TAINTED(arg.cmd)) {
+	rb_raise(rb_eSecurityError, "Insecure: tainted signal trap");
+    }
 #if !defined(NT)
     /* disable interrupt */
 # ifdef HAVE_SIGPROCMASK