rubyzip 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f451a3c548c2fb166c19e08e716375d3f27850975e33fad1ef57a09e15fadc0
-  data.tar.gz: 2578620d86942c589aa4b74178d92fa7690a408be4fc1ecdc3285dfcebc7526b
+  metadata.gz: 67852d915e2ec168efb617d7577ac60196bf7433b3c2800981a14c5a43b939c5
+  data.tar.gz: '039b39e7e9e7f46e056da4d0070554eba081e26a4dd99e3dd47d76428628d29f'
 SHA512:
-  metadata.gz: 93d7eaa1d76b58942f116334e1195a88ed7cae1f7bc77493c087464323fe3a1829c04bcfe56beebffe18bb252bb45b08574b65782fa30b5d0d2f25d80241e0d0
-  data.tar.gz: 2dbdc409218799a047fc396eae4f7ba3e9087122aa4dbeefc5f0c0b10953c870680820f7ac086207f9f006118fdd2f26211ebea2414f6f0ea16f13a9ec4745f7
+  metadata.gz: ba24363c26265acbd295289685d5baa4d351a913d98de67064171c35f0055f04ac34b2e6db384af248e124b12abc505bac558205eadb2975d3d4da59178b9a54
+  data.tar.gz: b654167d21076c70ea58b6a185f4be83a6ef172d208bf4f8a8928ac82aa909773b20df462870dc833b1182f669334e18fd7283e23cf4040b770faea1a49d1e6a

data/Changelog.md

@@ -1,3 +1,12 @@
+# 3.2.2 (2025-11-02)
+
+- Fix reading EOCDs when header signatures are in an Entry payload. [#656](https://github.com/rubyzip/rubyzip/issues/656)
+
+Tooling/internal:
+
+- Stop using macos-13 runners in GitHub Actions.
+- Update YJIT GitHub Actions runners.
+
 # 3.2.1 (2025-10-24)
 
 - Fix `Entry#gather_fileinfo_from_srcpath` error messages. [#654](https://github.com/rubyzip/rubyzip/issues/654)

data/lib/zip/central_directory.rb

@@ -143,28 +143,27 @@ module Zip
       zip64_eocd_offset
     end
 
-    def unpack_e_o_c_d(buffer) # :nodoc:
+    # Unpack the EOCD and return a boolean indicating whether this header is
+    # complete without needing Zip64 extensions.
+    def unpack_e_o_c_d(buffer) # :nodoc: # rubocop:disable Naming/PredicateMethod
       _, # END_OF_CD_SIG. We know we have this at this point.
-      num_disk,
-      num_disk_cdir,
-      num_cdir_disk,
-      num_entries,
-      size_in_bytes,
-      cdir_offset,
+      @number_of_this_disk,
+      @number_of_disk_with_start_of_cdir,
+      @total_number_of_entries_in_cdir_on_this_disk,
+      @size,
+      @size_in_bytes,
+      @cdir_offset,
       comment_length = buffer.unpack('VvvvvVVv')
 
-      @number_of_this_disk = num_disk unless num_disk == 0xFFFF
-      @number_of_disk_with_start_of_cdir = num_disk_cdir unless num_disk_cdir == 0xFFFF
-      @total_number_of_entries_in_cdir_on_this_disk = num_cdir_disk unless num_cdir_disk == 0xFFFF
-      @size = num_entries unless num_entries == 0xFFFF
-      @size_in_bytes = size_in_bytes unless size_in_bytes == 0xFFFFFFFF
-      @cdir_offset = cdir_offset unless cdir_offset == 0xFFFFFFFF
-
       @comment = if comment_length.positive?
                    buffer.slice(STATIC_EOCD_SIZE, comment_length)
                  else
                    ''
                  end
+
+      !([@number_of_this_disk, @number_of_disk_with_start_of_cdir,
+         @total_number_of_entries_in_cdir_on_this_disk, @size].any?(0xFFFF) ||
+         @size_in_bytes == 0xFFFFFFFF || @cdir_offset == 0xFFFFFFFF)
     end
 
     def read_central_directory_entries(io) # :nodoc:
@@ -217,30 +216,37 @@ module Zip
       eocd_location = data.rindex([END_OF_CD_SIG].pack('V'))
       raise Error, 'Zip end of central directory signature not found' unless eocd_location
 
-      zip64_eocd_locator = data.rindex([ZIP64_EOCD_LOCATOR_SIG].pack('V'))
-
-      if zip64_eocd_locator
-        zip64_eocd_location = data.rindex([ZIP64_END_OF_CD_SIG].pack('V'))
+      # Parse the EOCD and return if it is complete without Zip64 extensions.
+      return if unpack_e_o_c_d(data.slice(eocd_location..-1))
 
-        zip64_eocd_data =
-          if zip64_eocd_location
-            data.slice(zip64_eocd_location..zip64_eocd_locator)
-          else
-            zip64_eocd_location = unpack_64_eocd_locator(
-              data.slice(zip64_eocd_locator..eocd_location)
-            )
-            unless zip64_eocd_location
-              raise Error, 'Zip64 end of central directory signature not found'
-            end
+      # Need to read in the Zip64 EOCD locator and then the Zip64 EOCD.
+      zip64_eocd_locator = data.rindex([ZIP64_EOCD_LOCATOR_SIG].pack('V'), eocd_location)
+      unless zip64_eocd_locator
+        raise Error, 'Zip64 end of central directory locator signature expected but not found'
+      end
 
-            io.seek(zip64_eocd_location, IO::SEEK_SET)
-            io.read(base_location + zip64_eocd_locator - zip64_eocd_location)
+      # Do we already have the Zip64 EOCD in the data we've read?
+      zip64_eocd_location = data.rindex([ZIP64_END_OF_CD_SIG].pack('V'), zip64_eocd_locator)
+
+      zip64_eocd_data =
+        if zip64_eocd_location
+          # Yes.
+          data.slice(zip64_eocd_location..zip64_eocd_locator)
+        else
+          # No. Read its location from the locator and then read it in.
+          zip64_eocd_location = unpack_64_eocd_locator(
+            data.slice(zip64_eocd_locator..eocd_location)
+          )
+          unless zip64_eocd_location
+            raise Error, 'Zip64 end of central directory signature not found'
           end
 
-        unpack_64_e_o_c_d(zip64_eocd_data)
-      end
+          io.seek(zip64_eocd_location, IO::SEEK_SET)
+          io.read(base_location + zip64_eocd_locator - zip64_eocd_location)
+        end
 
-      unpack_e_o_c_d(data.slice(eocd_location..-1))
+      # Finally, unpack the Zip64 EOCD.
+      unpack_64_e_o_c_d(zip64_eocd_data)
     end
 
     def eocd_data(io)

data/lib/zip/version.rb

@@ -2,5 +2,5 @@
 
 module Zip
   # The version of the Rubyzip library.
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Robert Haines
@@ -195,9 +195,9 @@ licenses:
 - BSD-2-Clause
 metadata:
   bug_tracker_uri: https://github.com/rubyzip/rubyzip/issues
-  changelog_uri: https://github.com/rubyzip/rubyzip/blob/v3.2.1/Changelog.md
-  documentation_uri: https://www.rubydoc.info/gems/rubyzip/3.2.1
-  source_code_uri: https://github.com/rubyzip/rubyzip/tree/v3.2.1
+  changelog_uri: https://github.com/rubyzip/rubyzip/blob/v3.2.2/Changelog.md
+  documentation_uri: https://www.rubydoc.info/gems/rubyzip/3.2.2
+  source_code_uri: https://github.com/rubyzip/rubyzip/tree/v3.2.2
   wiki_uri: https://github.com/rubyzip/rubyzip/wiki
   rubygems_mfa_required: 'true'
 rdoc_options: []