From 76d4fa8d15fb4e5a84e276b10ecbef22da38d681 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 1 Nov 2017 02:04:02 +0000
Subject: [PATCH] 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
---
 file.c                 |  2 +-
 test/ruby/test_file.rb | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/file.c b/file.c
index 843a9796b0..b7569ac75f 100644
--- a/file.c
+++ b/file.c
@@ -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)