summaryrefslogtreecommitdiff
path: root/signal.c
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2019-09-20 19:06:22 -0700
committerJeremy Evans <code@jeremyevans.net>2019-11-18 01:00:25 +0200
commitc5c05460ac20abcbc0ed686eb4acf06da7a39a79 (patch)
tree991109a68f3b1cd2e256a936701d3b2badd3ddac /signal.c
parent7b6a8b5b54448235e17ed187d9d73f56893e1b6f (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 'signal.c')
-rw-r--r--signal.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/signal.c b/signal.c
index 8fb43067cb..82aeb81718 100644
--- a/signal.c
+++ b/signal.c
@@ -1024,7 +1024,7 @@ sig_do_nothing(int sig)
#endif
static int
-signal_exec(VALUE cmd, int safe, int sig)
+signal_exec(VALUE cmd, int sig)
{
rb_execution_context_t *ec = GET_EC();
volatile rb_atomic_t old_interrupt_mask = ec->interrupt_mask;
@@ -1043,7 +1043,7 @@ signal_exec(VALUE cmd, int safe, int sig)
EC_PUSH_TAG(ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
VALUE signum = INT2NUM(sig);
- rb_eval_cmd(cmd, rb_ary_new3(1, signum), safe);
+ rb_eval_cmd(cmd, rb_ary_new3(1, signum), 0);
}
EC_POP_TAG();
ec = GET_EC();
@@ -1063,7 +1063,7 @@ rb_vm_trap_exit(rb_vm_t *vm)
if (trap_exit) {
vm->trap_list.cmd[0] = 0;
- signal_exec(trap_exit, vm->trap_list.safe[0], 0);
+ signal_exec(trap_exit, 0);
}
}
@@ -1083,7 +1083,6 @@ rb_signal_exec(rb_thread_t *th, int sig)
{
rb_vm_t *vm = GET_VM();
VALUE cmd = vm->trap_list.cmd[sig];
- int safe = vm->trap_list.safe[sig];
if (cmd == 0) {
switch (sig) {
@@ -1116,7 +1115,7 @@ rb_signal_exec(rb_thread_t *th, int sig)
rb_threadptr_signal_exit(th);
}
else {
- return signal_exec(cmd, safe, sig);
+ return signal_exec(cmd, sig);
}
return FALSE;
}
@@ -1302,7 +1301,6 @@ trap(int sig, sighandler_t func, VALUE command)
}
ACCESS_ONCE(VALUE, vm->trap_list.cmd[sig]) = command;
- vm->trap_list.safe[sig] = rb_safe_level();
return oldcmd;
}