@zip.js/zip.js 2.18.1 → 2.18.2

package/index.cjs

@@ -6030,19 +6030,11 @@ async function detectOverlappingEntry({
 		const zip64 = Boolean(extraFieldZip64);
 		const dataDescriptorArray = await readUint8Array(reader, dataOffset + compressedSize, DATA_DESCRIPTOR_RECORD_ZIP_64_LENGTH + DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH);
 		const dataDescriptorView = getDataView(dataDescriptorArray);
-		const ignoreCrc32 = fileEntry.encrypted && !fileEntry.zipCrypto;
-		let localDataDescriptor;
-		for (const [zip64Layout, signature] of [[zip64, true], [zip64, false], [!zip64, true], [!zip64, false]]) {
-			const candidate = readDataDescriptor(dataDescriptorView, zip64Layout, signature);
-			if (candidate && (ignoreCrc32 || candidate.crc32 == crc32) &&
-				candidate.compressedSize == compressedSize && candidate.uncompressedSize == uncompressedSize) {
-				localDataDescriptor = candidate;
-				break;
-			}
-		}
-		if (!localDataDescriptor) {
-			localDataDescriptor = readDataDescriptor(dataDescriptorView, zip64, false);
-		}
+		const candidates = [[zip64, true], [zip64, false], [!zip64, true], [!zip64, false]]
+			.map(([zip64Layout, signature]) => readDataDescriptor(dataDescriptorView, zip64Layout, signature))
+			.filter(candidate => candidate && candidate.compressedSize == compressedSize && candidate.uncompressedSize == uncompressedSize);
+		const localDataDescriptor = candidates.find(candidate => candidate.crc32 == crc32) || candidates[0] ||
+			readDataDescriptor(dataDescriptorView, zip64, true) || readDataDescriptor(dataDescriptorView, zip64, false);
 		if (localDataDescriptor) {
 			fileEntry.localDirectory.dataDescriptor = localDataDescriptor;
 			dataDescriptorLength = getDataDescriptorLength(localDataDescriptor.zip64, localDataDescriptor.signature);
@@ -9057,7 +9049,7 @@ function formatSupported(StreamClass, format) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.18.1";
+const VERSION = "2.18.2";
 
 /*
  Copyright (c) 2025 Gildas Lormeau. All rights reserved.

package/index.d.cts

@@ -2240,8 +2240,8 @@ export interface LocalDataDescriptor {
    * `true` if the record is preceded by its optional signature.
    *
    * The signature is not part of the original format, it is a later convention writers are free to follow. It is
-   * reported as absent when the values following it disagree with the central directory, since the record is then
-   * read as starting at the first byte.
+   * `false` when the record is read as starting at its first byte, see {@link LocalDataDescriptor#zip64} for how the
+   * layout is chosen.
    */
   signature: boolean;
   /**
@@ -2251,9 +2251,10 @@ export interface LocalDataDescriptor {
    * sizes, and the Zip64 extra field of the central directory record, written last, describes that record, not the
    * descriptor, so e.g. an entry placed past 4 GB can carry a Zip64 extra field in its central directory record for
    * its offset alone and a descriptor with 4-byte sizes. The record is therefore read with the layout, among the two
-   * widths with and without the signature, whose values agree with the central directory; when none does, the width
-   * announced by the Zip64 extra field of the local file header or of the central directory record is used, without
-   * the signature.
+   * widths with and without the signature, whose sizes agree with the central directory, its CRC-32 too when the
+   * central directory stores one and several layouts qualify; when none does, the width announced by the Zip64 extra
+   * field of the local file header or of the central directory record is used, with the signature when the record
+   * starts with one.
    */
   zip64: boolean;
   /**

package/index.d.ts

@@ -2240,8 +2240,8 @@ export interface LocalDataDescriptor {
    * `true` if the record is preceded by its optional signature.
    *
    * The signature is not part of the original format, it is a later convention writers are free to follow. It is
-   * reported as absent when the values following it disagree with the central directory, since the record is then
-   * read as starting at the first byte.
+   * `false` when the record is read as starting at its first byte, see {@link LocalDataDescriptor#zip64} for how the
+   * layout is chosen.
    */
   signature: boolean;
   /**
@@ -2251,9 +2251,10 @@ export interface LocalDataDescriptor {
    * sizes, and the Zip64 extra field of the central directory record, written last, describes that record, not the
    * descriptor, so e.g. an entry placed past 4 GB can carry a Zip64 extra field in its central directory record for
    * its offset alone and a descriptor with 4-byte sizes. The record is therefore read with the layout, among the two
-   * widths with and without the signature, whose values agree with the central directory; when none does, the width
-   * announced by the Zip64 extra field of the local file header or of the central directory record is used, without
-   * the signature.
+   * widths with and without the signature, whose sizes agree with the central directory, its CRC-32 too when the
+   * central directory stores one and several layouts qualify; when none does, the width announced by the Zip64 extra
+   * field of the local file header or of the central directory record is used, with the signature when the record
+   * starts with one.
    */
   zip64: boolean;
   /**