Skip to content

Commit 238f901

Browse files
gildas-lormeaugildas-lormeau
committed
bump version
1 parent 73e49cd commit 238f901

File tree

12 files changed

+45
-21
lines changed

12 files changed

+45
-21
lines changed

‎dist/zip-fs-full.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8767,6 +8767,7 @@
87678767
options,
87688768
config: getConfiguration(),
87698769
files: new Map(),
8770+
filenames: new Set(),
87708771
offset: writer.size || 0,
87718772
pendingCompressedSize: 0,
87728773
pendingEntries: [],
@@ -8785,9 +8786,17 @@
87858786
workers++;
87868787
let promiseAddFile;
87878788
try {
8789+
name = name.trim();
8790+
if (zipWriter.filenames.has(name)) {
8791+
throw new Error(ERR_DUPLICATED_NAME);
8792+
}
8793+
zipWriter.filenames.add(name);
87888794
promiseAddFile = addFile(zipWriter, name, reader, options);
87898795
pendingAddFileCalls.add(promiseAddFile);
87908796
return await promiseAddFile;
8797+
} catch (error) {
8798+
zipWriter.filenames.delete(name);
8799+
throw error;
87918800
} finally {
87928801
pendingAddFileCalls.delete(promiseAddFile);
87938802
workers--;
@@ -8824,9 +8833,6 @@
88248833
} else {
88258834
options.directory = name.endsWith(DIRECTORY_SIGNATURE);
88268835
}
8827-
if (zipWriter.files.has(name)) {
8828-
throw new Error(ERR_DUPLICATED_NAME);
8829-
}
88308836
const rawFilename = encodeText(name);
88318837
if (rawFilename.length > MAX_16_BITS) {
88328838
throw new Error(ERR_INVALID_ENTRY_NAME);

‎dist/zip-fs-full.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/zip-fs.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3532,6 +3532,7 @@
35323532
options,
35333533
config: getConfiguration(),
35343534
files: new Map(),
3535+
filenames: new Set(),
35353536
offset: writer.size || 0,
35363537
pendingCompressedSize: 0,
35373538
pendingEntries: [],
@@ -3550,9 +3551,17 @@
35503551
workers++;
35513552
let promiseAddFile;
35523553
try {
3554+
name = name.trim();
3555+
if (zipWriter.filenames.has(name)) {
3556+
throw new Error(ERR_DUPLICATED_NAME);
3557+
}
3558+
zipWriter.filenames.add(name);
35533559
promiseAddFile = addFile(zipWriter, name, reader, options);
35543560
pendingAddFileCalls.add(promiseAddFile);
35553561
return await promiseAddFile;
3562+
} catch (error) {
3563+
zipWriter.filenames.delete(name);
3564+
throw error;
35563565
} finally {
35573566
pendingAddFileCalls.delete(promiseAddFile);
35583567
workers--;
@@ -3589,9 +3598,6 @@
35893598
} else {
35903599
options.directory = name.endsWith(DIRECTORY_SIGNATURE);
35913600
}
3592-
if (zipWriter.files.has(name)) {
3593-
throw new Error(ERR_DUPLICATED_NAME);
3594-
}
35953601
const rawFilename = encodeText(name);
35963602
if (rawFilename.length > MAX_16_BITS) {
35973603
throw new Error(ERR_INVALID_ENTRY_NAME);

‎dist/zip-fs.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/zip-full.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7766,6 +7766,7 @@
77667766
options,
77677767
config: getConfiguration(),
77687768
files: new Map(),
7769+
filenames: new Set(),
77697770
offset: writer.size || 0,
77707771
pendingCompressedSize: 0,
77717772
pendingEntries: [],
@@ -7784,9 +7785,17 @@
77847785
workers++;
77857786
let promiseAddFile;
77867787
try {
7788+
name = name.trim();
7789+
if (zipWriter.filenames.has(name)) {
7790+
throw new Error(ERR_DUPLICATED_NAME);
7791+
}
7792+
zipWriter.filenames.add(name);
77877793
promiseAddFile = addFile(zipWriter, name, reader, options);
77887794
pendingAddFileCalls.add(promiseAddFile);
77897795
return await promiseAddFile;
7796+
} catch (error) {
7797+
zipWriter.filenames.delete(name);
7798+
throw error;
77907799
} finally {
77917800
pendingAddFileCalls.delete(promiseAddFile);
77927801
workers--;
@@ -7823,9 +7832,6 @@
78237832
} else {
78247833
options.directory = name.endsWith(DIRECTORY_SIGNATURE);
78257834
}
7826-
if (zipWriter.files.has(name)) {
7827-
throw new Error(ERR_DUPLICATED_NAME);
7828-
}
78297835
const rawFilename = encodeText(name);
78307836
if (rawFilename.length > MAX_16_BITS) {
78317837
throw new Error(ERR_INVALID_ENTRY_NAME);

‎dist/zip-full.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/zip-no-worker-deflate.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/zip-no-worker.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/zip.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3532,6 +3532,7 @@
35323532
options,
35333533
config: getConfiguration(),
35343534
files: new Map(),
3535+
filenames: new Set(),
35353536
offset: writer.size || 0,
35363537
pendingCompressedSize: 0,
35373538
pendingEntries: [],
@@ -3550,9 +3551,17 @@
35503551
workers++;
35513552
let promiseAddFile;
35523553
try {
3554+
name = name.trim();
3555+
if (zipWriter.filenames.has(name)) {
3556+
throw new Error(ERR_DUPLICATED_NAME);
3557+
}
3558+
zipWriter.filenames.add(name);
35533559
promiseAddFile = addFile(zipWriter, name, reader, options);
35543560
pendingAddFileCalls.add(promiseAddFile);
35553561
return await promiseAddFile;
3562+
} catch (error) {
3563+
zipWriter.filenames.delete(name);
3564+
throw error;
35563565
} finally {
35573566
pendingAddFileCalls.delete(promiseAddFile);
35583567
workers--;
@@ -3589,9 +3598,6 @@
35893598
} else {
35903599
options.directory = name.endsWith(DIRECTORY_SIGNATURE);
35913600
}
3592-
if (zipWriter.files.has(name)) {
3593-
throw new Error(ERR_DUPLICATED_NAME);
3594-
}
35953601
const rawFilename = encodeText(name);
35963602
if (rawFilename.length > MAX_16_BITS) {
35973603
throw new Error(ERR_INVALID_ENTRY_NAME);

‎dist/zip.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)