From 2f3a3bb087f9b3316d82a9b6ea96f028259d6bdb Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 19 Jun 2004 04:24:34 +0000 Subject: * eval.c (method_call): allow changing $SAFE. [ruby-dev:23713] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ eval.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d201a01a9..fecc989fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 19 13:24:15 2004 Nobuyoshi Nakada + + * eval.c (method_call): allow changing $SAFE. [ruby-dev:23713] + Fri Jun 18 23:12:22 2004 Nobuyoshi Nakada * eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit diff --git a/eval.c b/eval.c index 8214192fd..de149c0bd 100644 --- a/eval.c +++ b/eval.c @@ -8691,7 +8691,7 @@ method_call(argc, argv, method) VALUE result = Qnil; /* OK */ struct METHOD *data; int state; - volatile int safe = ruby_safe_level; + volatile int safe = -1; Data_Get_Struct(method, struct METHOD, data); if (data->recv == Qundef) { @@ -8699,15 +8699,16 @@ method_call(argc, argv, method) } PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT); PUSH_TAG(PROT_NONE); - if (OBJ_TAINTED(method) && ruby_safe_level < 4) { - ruby_safe_level = 4; + if (OBJ_TAINTED(method)) { + safe = ruby_safe_level; + if (ruby_safe_level < 4) ruby_safe_level = 4; } if ((state = EXEC_TAG()) == 0) { result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,0); } POP_TAG(); POP_ITER(); - ruby_safe_level = safe; + if (safe >= 0) ruby_safe_level = safe; if (state) JUMP_TAG(state); return result; } -- cgit