diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 10:29:15 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 10:29:15 +0000 |
commit | a606704e84b1491ea3e490746171c4f882b683e9 (patch) | |
tree | 61dbd414743dc269d4a91f1d4f06b517ee2dd180 | |
parent | 89133fafe70c7a3b5d04cf2be028e1eacc6e0447 (diff) |
merge revision(s) 62990:
Ignore file separator from tmpfile/tmpdir name.
From: SHIBATA Hiroshi <hsbt@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/tmpdir.rb | 2 | ||||
-rw-r--r-- | test/test_tempfile.rb | 28 | ||||
-rw-r--r-- | test/test_tmpdir.rb | 17 | ||||
-rw-r--r-- | version.h | 2 |
5 files changed, 51 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Wed Mar 28 19:29:03 2018 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + Ignore file separator from tmpfile/tmpdir name. + Wed Mar 28 19:24:20 2018 Nobuyoshi Nakada <nobu@ruby-lang.org> dir.c: check NUL bytes diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index e4df93c2d0..61eac3ba61 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -109,8 +109,10 @@ class Dir def make_tmpname((prefix, suffix), n) prefix = (String.try_convert(prefix) or raise ArgumentError, "unexpected prefix: #{prefix.inspect}") + prefix = prefix.delete("#{File::SEPARATOR}#{File::ALT_SEPARATOR}") suffix &&= (String.try_convert(suffix) or raise ArgumentError, "unexpected suffix: #{suffix.inspect}") + suffix &&= suffix.delete("#{File::SEPARATOR}#{File::ALT_SEPARATOR}") t = Time.now.strftime("%Y%m%d") path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}".dup path << "-#{n}" if n diff --git a/test/test_tempfile.rb b/test/test_tempfile.rb index 21edf39776..eba139fe25 100644 --- a/test/test_tempfile.rb +++ b/test/test_tempfile.rb @@ -352,5 +352,31 @@ puts Tempfile.new('foo').path f.close if f && !f.closed? File.unlink path if path end -end + TRAVERSAL_PATH = Array.new(Dir.pwd.split('/').count, '..').join('/') + Dir.pwd + '/' + + def test_open_traversal_dir + expect = Dir.glob(TRAVERSAL_PATH + '*').count + t = Tempfile.open([TRAVERSAL_PATH, 'foo']) + actual = Dir.glob(TRAVERSAL_PATH + '*').count + assert_equal expect, actual + ensure + t.close! + end + + def test_new_traversal_dir + expect = Dir.glob(TRAVERSAL_PATH + '*').count + t = Tempfile.new(TRAVERSAL_PATH + 'foo') + actual = Dir.glob(TRAVERSAL_PATH + '*').count + assert_equal expect, actual + ensure + t.close! + end + + def test_create_traversal_dir + expect = Dir.glob(TRAVERSAL_PATH + '*').count + Tempfile.create(TRAVERSAL_PATH + 'foo') + actual = Dir.glob(TRAVERSAL_PATH + '*').count + assert_equal expect, actual + end +end diff --git a/test/test_tmpdir.rb b/test/test_tmpdir.rb index 4fc4bca4d5..c9e85aeae2 100644 --- a/test/test_tmpdir.rb +++ b/test/test_tmpdir.rb @@ -56,4 +56,21 @@ class TestTmpdir < Test::Unit::TestCase assert_kind_of(String, d) } end + + TRAVERSAL_PATH = Array.new(Dir.pwd.split('/').count, '..').join('/') + Dir.pwd + '/' + TRAVERSAL_PATH.delete!(':') if /mswin|mingw/ =~ RUBY_PLATFORM + + def test_mktmpdir_traversal + expect = Dir.glob(TRAVERSAL_PATH + '*').count + Dir.mktmpdir(TRAVERSAL_PATH + 'foo') + actual = Dir.glob(TRAVERSAL_PATH + '*').count + assert_equal expect, actual + end + + def test_mktmpdir_traversal_array + expect = Dir.glob(TRAVERSAL_PATH + '*').count + Dir.mktmpdir([TRAVERSAL_PATH, 'foo']) + actual = Dir.glob(TRAVERSAL_PATH + '*').count + assert_equal expect, actual + end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-03-28" -#define RUBY_PATCHLEVEL 451 +#define RUBY_PATCHLEVEL 452 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 |