summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--eval.c35
-rw-r--r--gc.c13
-rw-r--r--intern.h2
-rw-r--r--signal.c28
5 files changed, 59 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ee775973a..5bedc16999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jun 29 10:31:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval_cmd, rb_thread_trap_eval): restore safe level.
+
+ * gc.c (define_final, run_final): preserve and restore safe level for
+ finalizers. [ruby-core:03058]
+
+ * signal.c (signal_exec, rb_trap_exit, trap): preserve and restore
+ safe level for signal handlers. [ruby-dev:23829]
+
Mon Jun 28 14:57:56 2004 Jeff Mitchell <quixoticsycophant@yahoo.com>
* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
diff --git a/eval.c b/eval.c
index ecc1599e16..d3b534f333 100644
--- a/eval.c
+++ b/eval.c
@@ -1661,19 +1661,29 @@ jump_tag_but_local_jump(state, val)
}
VALUE
-rb_eval_cmd(cmd, arg, tcheck)
+rb_eval_cmd(cmd, arg, level)
VALUE cmd, arg;
- int tcheck;
+ int level;
{
int state;
VALUE val = Qnil; /* OK */
struct SCOPE *saved_scope;
volatile int safe = ruby_safe_level;
+ if (OBJ_TAINTED(cmd)) {
+ level = 4;
+ }
if (TYPE(cmd) != T_STRING) {
PUSH_ITER(ITER_NOT);
- val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
+ PUSH_TAG(PROT_NONE);
+ ruby_safe_level = level;
+ if ((state = EXEC_TAG()) == 0) {
+ val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
+ }
+ ruby_safe_level = safe;
+ POP_TAG();
POP_ITER();
+ if (state) JUMP_TAG(state);
return val;
}
@@ -1686,9 +1696,7 @@ rb_eval_cmd(cmd, arg, tcheck)
ruby_frame->self = ruby_top_self;
PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
- if (tcheck && OBJ_TAINTED(cmd)) {
- ruby_safe_level = 4;
- }
+ ruby_safe_level = level;
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
@@ -9479,9 +9487,9 @@ thread_reset_raised()
static void rb_thread_ready _((rb_thread_t));
static VALUE
-rb_trap_eval(cmd, sig)
+rb_trap_eval(cmd, sig, safe)
VALUE cmd;
- int sig;
+ int sig, safe;
{
int state;
VALUE val = Qnil; /* OK */
@@ -9492,7 +9500,7 @@ rb_trap_eval(cmd, sig)
PUSH_TAG(PROT_NONE);
PUSH_ITER(ITER_NOT);
if ((state = EXEC_TAG()) == 0) {
- val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)), 0);
+ val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)), safe);
}
POP_ITER();
POP_TAG();
@@ -9702,7 +9710,7 @@ static int th_raise_argc;
static VALUE th_raise_argv[2];
static NODE *th_raise_node;
static VALUE th_cmd;
-static int th_sig;
+static int th_sig, th_safe;
static char *th_signm;
#define RESTORE_NORMAL 1
@@ -9794,7 +9802,7 @@ rb_thread_switch(n)
rb_interrupt();
break;
case RESTORE_TRAP:
- rb_trap_eval(th_cmd, th_sig);
+ rb_trap_eval(th_cmd, th_sig, th_safe);
break;
case RESTORE_RAISE:
ruby_frame->last_func = 0;
@@ -11723,9 +11731,9 @@ rb_thread_signal_raise(sig)
}
void
-rb_thread_trap_eval(cmd, sig)
+rb_thread_trap_eval(cmd, sig, safe)
VALUE cmd;
- int sig;
+ int sig, safe;
{
rb_thread_critical = 0;
if (!rb_thread_dead(curr_thread)) {
@@ -11735,6 +11743,7 @@ rb_thread_trap_eval(cmd, sig)
}
th_cmd = cmd;
th_sig = sig;
+ th_safe = safe;
curr_thread = main_thread;
rb_thread_restore_context(curr_thread, RESTORE_TRAP);
}
diff --git a/gc.c b/gc.c
index 063e5ba4b8..68d58df479 100644
--- a/gc.c
+++ b/gc.c
@@ -1674,6 +1674,8 @@ undefine_final(os, obj)
return obj;
}
+#define NODE_FINAL NODE_LIT
+
/*
* call-seq:
* ObjectSpace.define_finalizer(obj, aProc=proc())
@@ -1702,6 +1704,8 @@ define_final(argc, argv, os)
need_call_final = 1;
FL_SET(obj, FL_FINALIZE);
+ block = (VALUE)rb_node_newnode(NODE_FINAL, block, ruby_safe_level, 0);
+
if (!finalizer_table) {
finalizer_table = st_init_numtable();
}
@@ -1732,7 +1736,7 @@ static VALUE
run_single_final(args)
VALUE *args;
{
- rb_eval_cmd(args[0], args[1], 0);
+ rb_eval_cmd(args[0], args[1], (int)args[2]);
return Qnil;
}
@@ -1742,17 +1746,20 @@ run_final(obj)
{
long i;
int status, critical_save = rb_thread_critical;
- VALUE args[2], table;
+ VALUE args[3], table;
rb_thread_critical = Qtrue;
args[1] = rb_ary_new3(1, rb_obj_id(obj)); /* make obj into id */
+ args[2] = (VALUE)ruby_safe_level;
for (i=0; i<RARRAY(finalizers)->len; i++) {
args[0] = RARRAY(finalizers)->ptr[i];
rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
}
if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
for (i=0; i<RARRAY(table)->len; i++) {
- args[0] = RARRAY(table)->ptr[i];
+ NODE *final = (NODE *)RARRAY(table)->ptr[i];
+ args[0] = final->nd_lit;
+ args[2] = final->nd_nth;
rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
}
}
diff --git a/intern.h b/intern.h
index 04b96a00a3..c6d432d041 100644
--- a/intern.h
+++ b/intern.h
@@ -208,7 +208,7 @@ VALUE rb_thread_run _((VALUE));
VALUE rb_thread_kill _((VALUE));
VALUE rb_thread_create _((VALUE (*)(ANYARGS), void*));
void rb_thread_interrupt _((void));
-void rb_thread_trap_eval _((VALUE, int));
+void rb_thread_trap_eval _((VALUE, int, int));
void rb_thread_signal_raise _((char*));
int rb_thread_select _((int, fd_set *, fd_set *, fd_set *, struct timeval *));
void rb_thread_wait_for _((struct timeval));
diff --git a/signal.c b/signal.c
index bafaadd8bc..c45d3c95f4 100644
--- a/signal.c
+++ b/signal.c
@@ -298,7 +298,10 @@ rb_f_kill(argc, argv)
return INT2FIX(i-1);
}
-static VALUE trap_list[NSIG];
+static struct {
+ VALUE cmd;
+ int safe;
+} trap_list[NSIG];
static rb_atomic_t trap_pending_list[NSIG];
rb_atomic_t rb_trap_pending;
rb_atomic_t rb_trap_immediate;
@@ -311,8 +314,8 @@ rb_gc_mark_trap_list()
int i;
for (i=0; i<NSIG; i++) {
- if (trap_list[i])
- rb_gc_mark(trap_list[i]);
+ if (trap_list[i].cmd)
+ rb_gc_mark(trap_list[i].cmd);
}
#endif /* MACOS_UNUSE_SIGNAL */
}
@@ -366,7 +369,7 @@ static void
signal_exec(sig)
int sig;
{
- if (trap_list[sig] == 0) {
+ if (trap_list[sig].cmd == 0) {
switch (sig) {
case SIGINT:
rb_thread_interrupt();
@@ -391,7 +394,7 @@ signal_exec(sig)
}
}
else {
- rb_thread_trap_eval(trap_list[sig], sig);
+ rb_thread_trap_eval(trap_list[sig].cmd, sig, trap_list[sig].safe);
}
}
@@ -458,11 +461,11 @@ void
rb_trap_exit()
{
#ifndef MACOS_UNUSE_SIGNAL
- if (trap_list[0]) {
- VALUE trap_exit = trap_list[0];
+ if (trap_list[0].cmd) {
+ VALUE trap_exit = trap_list[0].cmd;
- trap_list[0] = 0;
- rb_eval_cmd(trap_exit, rb_ary_new3(1, INT2FIX(0)), 0);
+ trap_list[0].cmd = 0;
+ rb_eval_cmd(trap_exit, rb_ary_new3(1, INT2FIX(0)), trap_list[0].safe);
}
#endif
}
@@ -620,14 +623,15 @@ trap(arg)
}
}
oldfunc = ruby_signal(sig, func);
- oldcmd = trap_list[sig];
+ oldcmd = trap_list[sig].cmd;
if (!oldcmd) {
if (oldfunc == SIG_IGN) oldcmd = rb_str_new2("IGNORE");
else if (oldfunc == sighandler) oldcmd = rb_str_new2("DEFAULT");
else oldcmd = Qnil;
}
- trap_list[sig] = command;
+ trap_list[sig].cmd = command;
+ trap_list[sig].safe = ruby_safe_level;
/* enable at least specified signal. */
#ifndef _WIN32
#ifdef HAVE_SIGPROCMASK
@@ -794,7 +798,7 @@ init_sigchld(sig)
if (oldfunc != SIG_DFL && oldfunc != SIG_IGN) {
ruby_signal(sig, oldfunc);
} else {
- trap_list[sig] = 0;
+ trap_list[sig].cmd = 0;
}
#ifndef _WIN32
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 00:44:37 +0000