mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
5ee9513a71
[Feature #14045] * insns.def (getblockparam, setblockparam): add special access instructions for block parameters. getblockparam checks VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM and if it is not set this instruction creates a Proc object from a given blcok and set VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM. setblockparam is similar to setlocal, but set VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM. * compile.c: use get/setblockparm instead get/setlocal instructions. Note that they are used for method local block parameters (def m(&b)), not for block local method parameters (iter{|&b|). * proc.c (get_local_variable_ptr): creates Proc object for Binding#local_variable_get/set. * safe.c (safe_setter): we need to create Proc objects for postponed block parameters when $SAFE is changed. * vm_args.c (args_setup_block_parameter): used only for block local blcok parameters. * vm_args.c (vm_caller_setup_arg_block): if called with VM_CALL_ARGS_BLOCKARG_BLOCKPARAM flag then passed block values should be a block handler. * test/ruby/test_optimization.rb: add tests. * benchmark/bm_vm1_blockparam*: added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
136 lines
2.5 KiB
C
136 lines
2.5 KiB
C
/**********************************************************************
|
|
|
|
safe.c -
|
|
|
|
$Author$
|
|
created at: Tue Sep 23 09:44:32 JST 2008
|
|
|
|
Copyright (C) 2008 Yukihiro Matsumoto
|
|
|
|
**********************************************************************/
|
|
|
|
/* safe-level:
|
|
0 - strings from streams/environment/ARGV are tainted (default)
|
|
1 - no dangerous operation by tainted value
|
|
*/
|
|
|
|
#define SAFE_LEVEL_MAX RUBY_SAFE_LEVEL_MAX
|
|
|
|
#include "ruby/ruby.h"
|
|
#include "vm_core.h"
|
|
|
|
/* $SAFE accessor */
|
|
|
|
#undef rb_secure
|
|
#undef rb_set_safe_level
|
|
#undef ruby_safe_level_2_warning
|
|
|
|
int
|
|
ruby_safe_level_2_warning(void)
|
|
{
|
|
return 2;
|
|
}
|
|
|
|
int
|
|
rb_safe_level(void)
|
|
{
|
|
return GET_THREAD()->ec.safe_level;
|
|
}
|
|
|
|
void
|
|
rb_set_safe_level_force(int safe)
|
|
{
|
|
GET_THREAD()->ec.safe_level = safe;
|
|
}
|
|
|
|
void
|
|
rb_set_safe_level(int level)
|
|
{
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
if (level > th->ec.safe_level) {
|
|
if (level > SAFE_LEVEL_MAX) {
|
|
rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete");
|
|
}
|
|
th->ec.safe_level = level;
|
|
}
|
|
}
|
|
|
|
static VALUE
|
|
safe_getter(void)
|
|
{
|
|
return INT2NUM(rb_safe_level());
|
|
}
|
|
|
|
static void
|
|
safe_setter(VALUE val)
|
|
{
|
|
rb_thread_t *th = GET_THREAD();
|
|
int current_level = th->ec.safe_level;
|
|
int level = NUM2INT(val);
|
|
|
|
if (level == current_level) {
|
|
return;
|
|
}
|
|
else if (level < current_level) {
|
|
rb_raise(rb_eSecurityError,
|
|
"tried to downgrade safe level from %d to %d",
|
|
current_level, level);
|
|
}
|
|
else if (level > SAFE_LEVEL_MAX) {
|
|
rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete");
|
|
}
|
|
|
|
/* block parameters */
|
|
rb_vm_stack_to_heap(th);
|
|
|
|
th->ec.safe_level = level;
|
|
}
|
|
|
|
void
|
|
rb_secure(int level)
|
|
{
|
|
if (level <= rb_safe_level()) {
|
|
ID caller_name = rb_frame_callee();
|
|
if (caller_name) {
|
|
rb_raise(rb_eSecurityError, "Insecure operation `%"PRIsVALUE"' at level %d",
|
|
rb_id2str(caller_name), rb_safe_level());
|
|
}
|
|
else {
|
|
rb_raise(rb_eSecurityError, "Insecure operation at level %d",
|
|
rb_safe_level());
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
rb_secure_update(VALUE obj)
|
|
{
|
|
}
|
|
|
|
void
|
|
rb_insecure_operation(void)
|
|
{
|
|
ID caller_name = rb_frame_callee();
|
|
if (caller_name) {
|
|
rb_raise(rb_eSecurityError, "Insecure operation - %"PRIsVALUE,
|
|
rb_id2str(caller_name));
|
|
}
|
|
else {
|
|
rb_raise(rb_eSecurityError, "Insecure operation: -r");
|
|
}
|
|
}
|
|
|
|
void
|
|
rb_check_safe_obj(VALUE x)
|
|
{
|
|
if (rb_safe_level() > 0 && OBJ_TAINTED(x)) {
|
|
rb_insecure_operation();
|
|
}
|
|
}
|
|
|
|
void
|
|
Init_safe(void)
|
|
{
|
|
rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
|
|
}
|