kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Constified unusable chars

Browse source
This commit is contained in:
Nobuyoshi Nakada 2019-06-21 23:03:36 +09:00
parent 551ef27490
commit 1c7e303b26
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/tmpdir.rb
View file

@ -112,6 +112,8 @@ class Dir
Dir.tmpdir Dir.tmpdir
end end
UNUSABLE_CHARS = [File::SEPARATOR, File::ALT_SEPARATOR, File::PATH_SEPARATOR, ":"].uniq.join("").freeze
def create(basename, tmpdir=nil, max_try: nil, **opts) def create(basename, tmpdir=nil, max_try: nil, **opts)
if $SAFE > 0 and tmpdir.tainted? if $SAFE > 0 and tmpdir.tainted?
tmpdir = '/tmp' tmpdir = '/tmp'
@ -123,10 +125,10 @@ class Dir
prefix, suffix = basename prefix, suffix = basename
prefix = (String.try_convert(prefix) or prefix = (String.try_convert(prefix) or
raise ArgumentError, "unexpected prefix: #{prefix.inspect}") raise ArgumentError, "unexpected prefix: #{prefix.inspect}")
prefix = prefix.delete("#{File::SEPARATOR}#{File::ALT_SEPARATOR}") prefix = prefix.delete(UNUSABLE_CHARS)
suffix &&= (String.try_convert(suffix) or suffix &&= (String.try_convert(suffix) or
raise ArgumentError, "unexpected suffix: #{suffix.inspect}") raise ArgumentError, "unexpected suffix: #{suffix.inspect}")
suffix &&= suffix.delete("#{File::SEPARATOR}#{File::ALT_SEPARATOR}") suffix &&= suffix.delete(UNUSABLE_CHARS)
begin begin
t = Time.now.strftime("%Y%m%d") t = Time.now.strftime("%Y%m%d")
path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"\ path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"\