diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fileutils.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 08e21a07d2..20177a048c 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -385,7 +385,7 @@ module FileUtils if st.directory? and (deref or not st.symlink?) stack.concat Dir.entries("#{prefix}/#{rel}")\ .reject {|ent| ent == '.' or ent == '..' }\ - .map {|ent| "#{rel}/#{ent}" }.reverse + .map {|ent| "#{rel}/#{ent.untaint}" }.reverse end yield rel, deref, st deref = false @@ -692,8 +692,8 @@ module FileUtils def remove_dir(dir, force = false) #:nodoc: Dir.foreach(dir) do |file| - next if /\A\.\.?\z/ === file - path = "#{dir}/#{file}" + next if /\A\.\.?\z/ =~ file + path = "#{dir}/#{file.untaint}" if File.symlink?(path) remove_file path, force elsif File.directory?(path) |