diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-12 14:20:51 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-12 14:20:51 +0000 |
commit | 1f828497d1e8df2b7b68ac2a093ab4439585d88a (patch) | |
tree | 6cf1bd0f1cc7921226608ccc133930aae49e7c82 /safe.c | |
parent | b53a183c009b3cb72b5964cf5652763b4cebf0f6 (diff) | |
download | ruby-1f828497d1e8df2b7b68ac2a093ab4439585d88a.tar.gz |
* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
when $SAFE is set to 4. $SAFE=4 is now obsolete.
[ruby-core:55222] [Feature #8468]
* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
Kernel#untrusted?, untrust, and trust are now deprecated.
Their behavior is same as tainted?, taint, and untaint,
respectively.
* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
respectively.
* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
ext/socket/socket.c, ext/socket/udpsocket.c,
ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
safe.c, string.c, thread.c, transcode.c, variable.c,
vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
$SAFE=4.
* test/dl/test_dl2.rb, test/erb/test_erb.rb,
test/readline/test_readline.rb,
test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
test/ruby/test_array.rb, test/ruby/test_dir.rb,
test/ruby/test_encoding.rb, test/ruby/test_env.rb,
test/ruby/test_eval.rb, test/ruby/test_exception.rb,
test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
test/ruby/test_io.rb, test/ruby/test_method.rb,
test/ruby/test_module.rb, test/ruby/test_object.rb,
test/ruby/test_pack.rb, test/ruby/test_rand.rb,
test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
test/ruby/test_struct.rb, test/ruby/test_thread.rb,
test/ruby/test_time.rb: remove tests for $SAFE=4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'safe.c')
-rw-r--r-- | safe.c | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -14,10 +14,9 @@ 1 - no dangerous operation by tainted value 2 - process/file operations prohibited 3 - all generated objects are tainted - 4 - no global (non-tainted) variable modification/no direct output */ -#define SAFE_LEVEL_MAX 4 +#define SAFE_LEVEL_MAX 3 #include "ruby/ruby.h" #include "vm_core.h" @@ -43,7 +42,7 @@ rb_set_safe_level(int level) if (level > th->safe_level) { if (level > SAFE_LEVEL_MAX) { - level = SAFE_LEVEL_MAX; + rb_raise(rb_eArgError, "$SAFE=4 is obsolete"); } th->safe_level = level; } @@ -67,10 +66,10 @@ safe_setter(VALUE val) th->safe_level, level); } if (level == 3) { - rb_warning("$SAFE=3 does no sandboxing; you might want to use $SAFE=4"); + rb_warning("$SAFE=3 does no sandboxing"); } if (level > SAFE_LEVEL_MAX) { - level = SAFE_LEVEL_MAX; + rb_raise(rb_eArgError, "$SAFE=4 is obsolete"); } th->safe_level = level; } @@ -94,8 +93,6 @@ rb_secure(int level) void rb_secure_update(VALUE obj) { - if (!OBJ_TAINTED(obj)) - rb_secure(4); } void @@ -117,7 +114,6 @@ rb_check_safe_obj(VALUE x) if (rb_safe_level() > 0 && OBJ_TAINTED(x)) { rb_insecure_operation(); } - rb_secure(4); } void |