Merge 529634e into 1777a3f

rubyzip · Jun 2, 2021 · 8bbdce9 · 8bbdce9
2 parents 1777a3f + 529634e
commit 8bbdce9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -20,7 +20,7 @@ Lint/MissingSuper:
 # Offense count: 5
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 601
+  Max: 610
 
 # Offense count: 20
 # Configuration parameters: IgnoredMethods.

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