@zip.js/zip.js 2.7.63 → 2.7.64

package/lib/core/constants.js

@@ -69,6 +69,8 @@ const VERSION_AES = 0x33;
 
 const DIRECTORY_SIGNATURE = "/";
 
+const HEADER_SIZE = 26;
+
 const MAX_DATE = new Date(2107, 11, 31);
 const MIN_DATE = new Date(1980, 0, 1);
 
@@ -113,6 +115,7 @@ export {
 	VERSION_DEFLATE,
 	VERSION_ZIP64,
 	VERSION_AES,
+	HEADER_SIZE,
 	DIRECTORY_SIGNATURE,
 	MIN_DATE,
 	MAX_DATE,

package/lib/core/io.js

@@ -513,6 +513,7 @@ class Uint8ArrayReader extends Reader {
 
 	constructor(array) {
 		super();
+		array = new Uint8Array(array.buffer, array.byteOffset, array.byteLength);
 		Object.assign(this, {
 			array,
 			size: array.length

package/lib/core/zip-fs-core.js

@@ -772,9 +772,8 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 					});
 				}
 			}
-			await zipWriter.add(name, child.reader, Object.assign({
-				directory: child.directory
-			}, Object.assign({}, options, zipEntryOptions, childOptions, {
+			await zipWriter.add(name, child.reader, Object.assign({}, options, zipEntryOptions, childOptions, {
+				directory: child.directory,
 				onprogress: async indexProgress => {
 					if (options.onprogress) {
 						entryOffsets.set(name, indexProgress);
@@ -786,7 +785,7 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 						}
 					}
 				}
-			})));
+			}));
 			await process(zipWriter, child);
 		}
 	}

package/lib/core/zip-reader.js

@@ -61,6 +61,7 @@ import {
 	FILE_ATTR_UNIX_TYPE_DIR,
 	FILE_ATTR_UNIX_EXECUTABLE_MASK,
 	DIRECTORY_SIGNATURE,
+	HEADER_SIZE,
 	UNDEFINED_VALUE
 } from "./constants.js";
 import {
@@ -416,7 +417,8 @@ class ZipEntry {
 			compressedSize
 		} = zipEntry;
 		const localDirectory = fileEntry.localDirectory = {};
-		const dataArray = await readUint8Array(reader, offset, 30, diskNumberStart);
+		const dataArraySize = HEADER_SIZE + 4;
+		const dataArray = await readUint8Array(reader, offset, dataArraySize + 4, diskNumberStart);
 		const dataView = getDataView(dataArray);
 		let password = getOptionValue(zipEntry, options, "password");
 		let rawPassword = getOptionValue(zipEntry, options, "rawPassword");
@@ -436,7 +438,7 @@ class ZipEntry {
 		}
 		readCommonHeader(localDirectory, dataView, 4);
 		localDirectory.rawExtraField = localDirectory.extraFieldLength ?
-			await readUint8Array(reader, offset + 30 + localDirectory.filenameLength, localDirectory.extraFieldLength, diskNumberStart) :
+			await readUint8Array(reader, offset + dataArraySize + localDirectory.filenameLength, localDirectory.extraFieldLength, diskNumberStart) :
 			new Uint8Array();
 		readCommonFooter(zipEntry, localDirectory, dataView, 4, true);
 		Object.assign(fileEntry, {
@@ -455,7 +457,7 @@ class ZipEntry {
 				throw new Error(ERR_ENCRYPTED);
 			}
 		}
-		const dataOffset = offset + 30 + localDirectory.filenameLength + localDirectory.extraFieldLength;
+		const dataOffset = offset + dataArraySize + localDirectory.filenameLength + localDirectory.extraFieldLength;
 		const size = compressedSize;
 		const readable = reader.readable;
 		Object.assign(readable, {