root
/
rubyzip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reinstate normalising pathname separators to `/`. 

But only do it after we have set filename encoding appropriately to
avoid breaking multibyte characters with `\`s in them.

Fixes #324.
This commit is contained in:
Robert Haines 2021-06-01 22:33:47 +01:00
parent 1777a3ff53
commit 22a54853e6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.rubocop_todo.yml
View File

@ -20,7 +20,7 @@ Lint/MissingSuper:
# Offense count: 5 # Offense count: 5
# Configuration parameters: CountComments, CountAsOne. # Configuration parameters: CountComments, CountAsOne.
Metrics/ClassLength: Metrics/ClassLength:
Max: 601 Max: 610
# Offense count: 20 # Offense count: 20
# Configuration parameters: IgnoredMethods. # Configuration parameters: IgnoredMethods.

8
lib/zip/entry.rb
View File

@ -296,13 +296,12 @@ module Zip
set_time(@last_mod_date, @last_mod_time) set_time(@last_mod_date, @last_mod_time)
@name = io.read(@name_length) @name = io.read(@name_length)
extra = io.read(@extra_length)
@name.tr!('\\', '/')
if ::Zip.force_entry_names_encoding if ::Zip.force_entry_names_encoding
@name.force_encoding(::Zip.force_entry_names_encoding) @name.force_encoding(::Zip.force_entry_names_encoding)
end end
@name.tr!('\\', '/') # Normalise filepath separators after encoding set.
extra = io.read(@extra_length)
if extra && extra.bytesize != @extra_length if extra && extra.bytesize != @extra_length
raise ::Zip::Error, 'Truncated local zip entry header' raise ::Zip::Error, 'Truncated local zip entry header'
end end
@ -424,10 +423,13 @@ module Zip
unpack_c_dir_entry(static_sized_fields_buf) unpack_c_dir_entry(static_sized_fields_buf)
check_c_dir_entry_signature check_c_dir_entry_signature
set_time(@last_mod_date, @last_mod_time) set_time(@last_mod_date, @last_mod_time)
@name = io.read(@name_length) @name = io.read(@name_length)
if ::Zip.force_entry_names_encoding if ::Zip.force_entry_names_encoding
@name.force_encoding(::Zip.force_entry_names_encoding) @name.force_encoding(::Zip.force_entry_names_encoding)
end end
@name.tr!('\\', '/') # Normalise filepath separators after encoding set.
read_extra_field(io.read(@extra_length)) read_extra_field(io.read(@extra_length))
@comment = io.read(@comment_length) @comment = io.read(@comment_length)
check_c_dir_entry_comment_size check_c_dir_entry_comment_size