1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert r60596 because it cause faulure on TestFile#test_realpath_taintedness

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-11-01 02:04:02 +00:00
parent bfbf5b0b3e
commit 76d4fa8d15
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file.c
View File

@ -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(unresolved_path);
RB_GC_GUARD(curdir); RB_GC_GUARD(curdir);
return resolved; return resolved;

17
test/ruby/test_file.rb
View File

@ -283,23 +283,6 @@ class TestFile < Test::Unit::TestCase
} }
end 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 def test_realdirpath
Dir.mktmpdir('rubytest-realdirpath') {|tmpdir| Dir.mktmpdir('rubytest-realdirpath') {|tmpdir|
realdir = File.realpath(tmpdir) realdir = File.realpath(tmpdir)