diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-18 10:36:51 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-18 10:36:51 +0000 |
commit | 04f0de74dd22bc9e06b14d0c777d15fcde2e50a8 (patch) | |
tree | 6b81ddcf49e9bdef5d0c7204c8a4aac4d5b96a29 /thread.c | |
parent | 408b8110d5935df37a63db9ce6173a2f779b4e20 (diff) |
* error.c, file.c, gc.c, hash.c, thread.c, variable.c, vm_eval.c, bin/erb:
$SAFE=4 is obsolete.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 25 |
1 files changed, 0 insertions, 25 deletions
@@ -541,10 +541,6 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s if (state == TAG_FATAL) { /* fatal error within this thread, need to stop whole script */ } - else if (th->safe_level >= 4) { - /* Ignore it. Main thread shouldn't be harmed from untrusted thread. */ - errinfo = Qnil; - } else if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) { /* exit on main_thread. */ } @@ -2176,8 +2172,6 @@ rb_thread_kill(VALUE thread) GetThreadPtr(thread, th); - if (th != GET_THREAD() && th->safe_level < 4) { - } if (th->to_kill || th->status == THREAD_KILLED) { return thread; } @@ -2741,9 +2735,6 @@ rb_thread_local_aref(VALUE thread, ID id) st_data_t val; GetThreadPtr(thread, th); - if (rb_safe_level() >= 4 && th != GET_THREAD()) { - rb_raise(rb_eSecurityError, "Insecure: thread locals"); - } if (!th->local_storage) { return Qnil; } @@ -2827,9 +2818,6 @@ rb_thread_local_aset(VALUE thread, ID id, VALUE val) rb_thread_t *th; GetThreadPtr(thread, th); - if (rb_safe_level() >= 4 && th != GET_THREAD()) { - rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals"); - } if (OBJ_FROZEN(thread)) { rb_error_frozen("thread locals"); } @@ -2898,15 +2886,8 @@ static VALUE rb_thread_variable_get(VALUE thread, VALUE key) { VALUE locals; - rb_thread_t *th; ID id = rb_check_id(&key); - GetThreadPtr(thread, th); - - if (rb_safe_level() >= 4 && th != GET_THREAD()) { - rb_raise(rb_eSecurityError, "Insecure: can't access thread locals"); - } - if (!id) return Qnil; locals = rb_ivar_get(thread, id_locals); return rb_hash_aref(locals, ID2SYM(id)); @@ -2925,13 +2906,7 @@ static VALUE rb_thread_variable_set(VALUE thread, VALUE id, VALUE val) { VALUE locals; - rb_thread_t *th; - GetThreadPtr(thread, th); - - if (rb_safe_level() >= 4 && th != GET_THREAD()) { - rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals"); - } if (OBJ_FROZEN(thread)) { rb_error_frozen("thread locals"); } |