diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | eval.c | 9 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Sat Jun 19 13:24:15 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (method_call): allow changing $SAFE. [ruby-dev:23713] + Fri Jun 18 23:12:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit @@ -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; } |