ko1	2017-11-01 11:04:02 +0900 (Wed, 01 Nov 2017)

  New Revision: 60598

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60598

  Log:
    revert r60596 because it cause faulure on TestFile#test_realpath_taintedness

  Modified files:
    trunk/file.c
    trunk/test/ruby/test_file.rb
Index: file.c
===================================================================
--- file.c	(revision 60597)
+++ file.c	(revision 60598)
@@ -4086,7 +4086,7 @@ rb_check_realpath_internal(VALUE basedir https://github.com/ruby/ruby/blob/trunk/file.c#L4086
 	}
     }
 
-    OBJ_INFECT(resolved, unresolved_path);
+    OBJ_TAINT(resolved);
     RB_GC_GUARD(unresolved_path);
     RB_GC_GUARD(curdir);
     return resolved;
Index: test/ruby/test_file.rb
===================================================================
--- test/ruby/test_file.rb	(revision 60597)
+++ test/ruby/test_file.rb	(revision 60598)
@@ -283,23 +283,6 @@ class TestFile < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file.rb#L283
     }
   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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/