diff options
| -rw-r--r-- | test/ruby/test_file.rb | 9 | ||||
| -rw-r--r-- | version.h | 8 |
2 files changed, 10 insertions, 7 deletions
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?) } @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.5" -#define RUBY_RELEASE_DATE "2018-08-27" -#define RUBY_PATCHLEVEL 322 +#define RUBY_RELEASE_DATE "2018-09-06" +#define RUBY_PATCHLEVEL 323 #define RUBY_RELEASE_YEAR 2018 -#define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_MONTH 9 +#define RUBY_RELEASE_DAY 6 #include "ruby/version.h" |