diff options
author | Jeremy Evans <code@jeremyevans.net> | 2019-09-20 19:06:22 -0700 |
---|---|---|
committer | Jeremy Evans <code@jeremyevans.net> | 2019-11-18 01:00:25 +0200 |
commit | c5c05460ac20abcbc0ed686eb4acf06da7a39a79 (patch) | |
tree | 991109a68f3b1cd2e256a936701d3b2badd3ddac /gc.c | |
parent | 7b6a8b5b54448235e17ed187d9d73f56893e1b6f (diff) |
Warn on access/modify of $SAFE, and remove effects of modifying $SAFE
This removes the security features added by $SAFE = 1, and warns for access
or modification of $SAFE from Ruby-level, as well as warning when calling
all public C functions related to $SAFE.
This modifies some internal functions that took a safe level argument
to no longer take the argument.
rb_require_safe now warns, rb_require_string has been added as a
version that takes a VALUE and does not warn.
One public C function that still takes a safe level argument and that
this doesn't warn for is rb_eval_cmd. We may want to consider
adding an alternative method that does not take a safe level argument,
and warn for rb_eval_cmd.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2476
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -3232,7 +3232,7 @@ define_final0(VALUE obj, VALUE block) RBASIC(obj)->flags |= FL_FINALIZE; - block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block); + block = rb_ary_new3(2, INT2FIX(0), block); OBJ_FREEZE(block); if (st_lookup(finalizer_table, obj, &data)) { @@ -3291,7 +3291,6 @@ run_single_final(VALUE final, VALUE objid) const int level = OBJ_TAINTED(cmd) ? RUBY_SAFE_LEVEL_MAX : FIX2INT(RARRAY_AREF(final, 0)); - rb_set_safe_level_force(level); return rb_check_funcall(cmd, idCall, 1, &objid); } @@ -3305,15 +3304,12 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table) VALUE objid; rb_control_frame_t *cfp; long finished; - int safe; } saved; rb_execution_context_t * volatile ec = GET_EC(); #define RESTORE_FINALIZER() (\ ec->cfp = saved.cfp, \ - rb_set_safe_level_force(saved.safe), \ rb_set_errinfo(saved.errinfo)) - saved.safe = rb_safe_level(); saved.errinfo = rb_errinfo(); saved.objid = rb_obj_id(obj); saved.cfp = ec->cfp; @@ -9389,10 +9385,8 @@ gc_set_initial_pages(void) */ void -ruby_gc_set_params(int safe_level) +ruby_gc_set_params(void) { - if (safe_level > 0) return; - /* RUBY_GC_HEAP_FREE_SLOTS */ if (get_envparam_size("RUBY_GC_HEAP_FREE_SLOTS", &gc_params.heap_free_slots, 0)) { /* ok */ |