Skip to content

fix: full unicode filename handling in 'writeUTF8' and 'sizeUTF8' #21

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
mehradotdev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: full unicode filename handling in 'writeUTF8' and 'sizeUTF8' #21

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
40 changes: 36 additions & 4 deletions UZIP.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,48 @@ var UZIP = {};
}
return out;
},
// Decode UTF-8 bytes into a JavaScript UTF-16 string. The helper below 'readUnicodeCodePoint' is
// for the opposite direction: reading Unicode code points from a JS string.
readUTF8 : function(buff, p, l) {
var s = "", ns;
for(var i=0; i<l; i++) s += "%" + B.pad(buff[p+i].toString(16));
try { ns = decodeURIComponent(s); }
catch(e) { return B.readASCII(buff, p, l); }
return ns;
},
/**
* Read one Unicode code point from a JavaScript string.
*
* JavaScript strings are UTF-16, so characters outside the BMP are stored
* as a surrogate pair (two code units). UTF-8 encoding, however, needs the
* full Unicode code point value.
*
* Returns a tuple:
* [0] => the Unicode code point value
* [1] => how many UTF-16 code units were consumed from the string
*/
readUnicodeCodePoint : function(str, ci) {
var c1 = str.charCodeAt(ci);
// High surrogate: try to combine it with the following low surrogate.
if(c1>=0xd800 && c1<=0xdbff && ci+1<str.length) {
var c2 = str.charCodeAt(ci+1);
// Valid surrogate pair -> convert the two UTF-16 code units into one
// Unicode code point.
if(c2>=0xdc00 && c2<=0xdfff) return [((c1-0xd800)<<10) + (c2-0xdc00) + 0x10000, 2];
}
// Lone low surrogate is invalid on its own. Return U+FFFD so callers can
// encode a replacement character instead of emitting malformed UTF-8.
if(c1>=0xdc00 && c1<=0xdfff) return [0xfffd, 1];
// Plain BMP code point; one UTF-16 code unit maps directly.
return [c1, 1];
},
writeUTF8 : function(buff, p, str) {
var strl = str.length, i=0;
for(var ci=0; ci<strl; ci++)
for(var ci=0; ci<strl; )
{
var code = str.charCodeAt(ci);
// Read by Unicode code point, not by raw UTF-16 code unit, so astral
// characters are encoded as a single 4-byte UTF-8 sequence.
var cp = B.readUnicodeCodePoint(str, ci), code = cp[0]; ci += cp[1];
if ((code&(0xffffffff-(1<< 7)+1))==0) { buff[p+i] = ( code ); i++; }
else if((code&(0xffffffff-(1<<11)+1))==0) { buff[p+i] = (192|(code>> 6)); buff[p+i+1] = (128|((code>> 0)&63)); i+=2; }
else if((code&(0xffffffff-(1<<16)+1))==0) { buff[p+i] = (224|(code>>12)); buff[p+i+1] = (128|((code>> 6)&63)); buff[p+i+2] = (128|((code>>0)&63)); i+=3; }
Expand All @@ -51,9 +81,11 @@ var UZIP = {};
},
sizeUTF8 : function(str) {
var strl = str.length, i=0;
for(var ci=0; ci<strl; ci++)
for(var ci=0; ci<strl; )
{
var code = str.charCodeAt(ci);
// Use the same code point traversal as writeUTF8 so the computed byte
// length always matches the actual UTF-8 bytes we will write.
var cp = B.readUnicodeCodePoint(str, ci), code = cp[0]; ci += cp[1];
if ((code&(0xffffffff-(1<< 7)+1))==0) { i++ ; }
else if((code&(0xffffffff-(1<<11)+1))==0) { i+=2; }
else if((code&(0xffffffff-(1<<16)+1))==0) { i+=3; }
Expand Down