diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-06-01 06:46:12 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-06-01 06:46:12 +0000 |
commit | d23012904ac77bff3d687e696fc00831546ac2fa (patch) | |
tree | 1fd6996816cc97c31d0bc780a81ae3a0a6d15722 /ruby.c | |
parent | c029880ae50e20733cb793a4b2f37e52528524cc (diff) |
* file.c (rb_file_s_unlink): should not allow if $SAFE >= 2.
* object.c (rb_obj_taint): backport from 1.7.
* object.c (rb_obj_untaint): add frozen status check (backport from 1.7).
* ruby.c (proc_options): unexpected SecurityError happens when -T4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -678,6 +678,11 @@ proc_options(argc, argv) ruby_show_copyright(); } + if (rb_safe_level() >= 4) { + OBJ_TAINT(rb_argv); + OBJ_TAINT(rb_load_path); + } + if (!e_script && argc == 0) { /* no more args */ if (verbose) exit(0); script = "-"; @@ -723,6 +728,11 @@ proc_options(argc, argv) process_sflag(); xflag = 0; + + if (rb_safe_level() >= 4) { + FL_UNSET(rb_argv, FL_TAINT); + FL_UNSET(rb_load_path, FL_TAINT); + } } extern int ruby__end__seen; |