From ad10b43f7f3a56dd77708416a6cf5b2f16d07325 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 6 Sep 2018 09:24:18 +0000 Subject: re-patched r50599 because of test failure on TravisCI. [Backport #14060] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_file.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index 215d579cc5..b2d85ae81e 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -294,16 +294,19 @@ class TestFile < Test::Unit::TestCase def test_realpath_taintedness Dir.mktmpdir('rubytest-realpath') {|tmpdir| - realdir = File.realpath(tmpdir) - assert_predicate(realdir, :tainted?) - dir, base = File.split(realdir) + dir = File.realpath(tmpdir).untaint + File.write(File.join(dir, base = "test.file"), '') + base.taint + dir.taint assert_predicate(File.realpath(base, dir), :tainted?) base.untaint + dir.taint assert_predicate(File.realpath(base, dir), :tainted?) base.taint dir.untaint assert_predicate(File.realpath(base, dir), :tainted?) base.untaint + dir.untaint assert_not_predicate(File.realpath(base, dir), :tainted?) assert_predicate(Dir.chdir(dir) {File.realpath(base)}, :tainted?) } -- cgit v1.2.3