Skip to content

Set FileOffset field in central directory header to special value when including FileOffset in ZIP64 extra fields #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ctalkington merged 1 commit into from
Feb 27, 2024
Merged

Set FileOffset field in central directory header to special value when including FileOffset in ZIP64 extra fields #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions lib/archivers/zip/zip-archive-output-stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,15 @@ ZipArchiveOutputStream.prototype._writeCentralDirectoryZip64 = function() {
ZipArchiveOutputStream.prototype._writeCentralFileHeader = function(ae) {
var gpb = ae.getGeneralPurposeBit();
var method = ae.getMethod();
var offsets = ae._offsets;
var fileOffset = ae._offsets.file;

var size = ae.getSize();
var compressedSize = ae.getCompressedSize();

if (ae.isZip64() || offsets.file > constants.ZIP64_MAGIC) {
if (ae.isZip64() || fileOffset > constants.ZIP64_MAGIC) {
size = constants.ZIP64_MAGIC;
compressedSize = constants.ZIP64_MAGIC;
fileOffset = constants.ZIP64_MAGIC;

ae.setVersionNeededToExtract(constants.MIN_VERSION_ZIP64);

Expand All @@ -279,7 +280,7 @@ ZipArchiveOutputStream.prototype._writeCentralFileHeader = function(ae) {
zipUtil.getShortBytes(24),
zipUtil.getEightBytes(ae.getSize()),
zipUtil.getEightBytes(ae.getCompressedSize()),
zipUtil.getEightBytes(offsets.file)
zipUtil.getEightBytes(ae._offsets.file)
], 28);

ae.setExtra(extraBuf);
Expand Down Expand Up @@ -336,11 +337,7 @@ ZipArchiveOutputStream.prototype._writeCentralFileHeader = function(ae) {
this.write(zipUtil.getLongBytes(ae.getExternalAttributes()));

// relative offset of LFH
if (offsets.file > constants.ZIP64_MAGIC) {
this.write(zipUtil.getLongBytes(constants.ZIP64_MAGIC));
} else {
this.write(zipUtil.getLongBytes(offsets.file));
}
this.write(zipUtil.getLongBytes(fileOffset));

// name
this.write(name);
Expand Down