Skip to content

Multibyte garble for file.name #12

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

Open
59naga wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Multibyte garble for file.name #12

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
12 changes: 6 additions & 6 deletions janzip/janzip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var Zip = function () {
// uncompressed size
header.writeInt32(file.data.length);
// file name length
header.writeInt16(file.name.length);
header.writeInt16((new Buffer(file.name,"utf8")).length);
// fill
writeBytes(header, [ 0x00, 0x00 ]);

Expand Down Expand Up @@ -144,10 +144,10 @@ var Zip = function () {
var fileHeader = getFileHeader(file, zipMethod.indicator, data);

// write files
var fileBuffer = new RollingBuffer(4 + fileHeader.length + file.name.length + data.length + (4*4));
var fileBuffer = new RollingBuffer(4 + fileHeader.length + (new Buffer(file.name,"utf8")).length + data.length + (4*4));
writeBytes(fileBuffer, [0x50, 0x4b, 0x03, 0x04]); // 4
fileBuffer.appendBuffer(fileHeader); // hmm...
fileBuffer.write(file.name, "ascii");
fileBuffer.write(file.name, "utf8");
fileBuffer.appendBuffer(data);

// 0x08074b50
Expand All @@ -161,7 +161,7 @@ var Zip = function () {
fileBuffer.writeInt32(file.data.length);

// now create dir
var dirBuffer = new RollingBuffer(4 + 2 + fileHeader.length + 6 + 4 + 4 + file.name.length);
var dirBuffer = new RollingBuffer(4 + 2 + fileHeader.length + 6 + 4 + 4 + (new Buffer(file.name,"utf8")).length);
writeBytes(dirBuffer, [0x50, 0x4b, 0x01, 0x02]);
writeBytes(dirBuffer, [0x14, 0x00]);
dirBuffer.appendBuffer(fileHeader);
Expand All @@ -172,7 +172,7 @@ var Zip = function () {
// relative offset of local header
dirBuffer.writeInt32(fileOffset);
// file name
dirBuffer.write(file.name, "ascii");
dirBuffer.write(file.name, "utf8");

// update offset
fileOffset += fileBuffer.length;
Expand Down Expand Up @@ -253,4 +253,4 @@ function writeBytes (target, data) {
for (var ix = 0; ix < data.length; ix++) {
target.writeInt8(data[ix]);
}
}
}