diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-01 02:04:02 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-01 02:04:02 +0000 |
commit | 76d4fa8d15fb4e5a84e276b10ecbef22da38d681 (patch) | |
tree | a96f33cb04b93e479a432192d7ec39a35c4df394 | |
parent | bfbf5b0b3ed32c50c6b211f3bd029583bed53cba (diff) | |
download | ruby-76d4fa8d15fb4e5a84e276b10ecbef22da38d681.tar.gz |
revert r60596 because it cause faulure on TestFile#test_realpath_taintedness
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | test/ruby/test_file.rb | 17 |
2 files changed, 1 insertions, 18 deletions
@@ -4086,7 +4086,7 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode } } - OBJ_INFECT(resolved, unresolved_path); + OBJ_TAINT(resolved); RB_GC_GUARD(unresolved_path); RB_GC_GUARD(curdir); return resolved; diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index e352d8fad9..4be4e86131 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -283,23 +283,6 @@ class TestFile < Test::Unit::TestCase } end - def test_realpath_taintedness - Dir.mktmpdir('rubytest-realpath') {|tmpdir| - realdir = File.realpath(tmpdir) - assert_predicate(realdir, :tainted?) - dir, base = File.split(realdir) - assert_predicate(File.realpath(base, dir), :tainted?) - base.untaint - assert_predicate(File.realpath(base, dir), :tainted?) - base.taint - dir.untaint - assert_predicate(File.realpath(base, dir), :tainted?) - base.untaint - assert_not_predicate(File.realpath(base, dir), :tainted?) - assert_predicate(Dir.chdir(dir) {File.realpath(base)}, :tainted?) - } - end - def test_realdirpath Dir.mktmpdir('rubytest-realdirpath') {|tmpdir| realdir = File.realpath(tmpdir) |