Merge pull request #2849 from jekyll/maybe-secure-doc-reading

2014-08-30 23:58:33 -07:00 · 2014-08-30 23:58:33 -07:00 · 27d3126d54
parent 7de681ef58 b5dbc36975
commit 27d3126d54
1 changed files with 1 additions and 1 deletions
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@ -41,7 +41,7 @@ module Jekyll
          doc.read
          docs << doc
        else
-          relative_dir = File.join(relative_directory, File.dirname(file_path)).chomp("/.")
+          relative_dir = Jekyll.sanitized_path(relative_directory, File.dirname(file_path)).chomp("/.")
          files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self)
        end
      end