0x5eal/rbxts-pako
1
0
Fork 0
mirror of https://github.com/0x5eal/rbxts-pako.git synced 2025-04-05 19:31:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed #26 (iOS 5.1 Safary), closes #26

Browse source
This commit is contained in:
Vitaly Puzrin 2014-06-03 20:45:37 +04:00
parent efea8e667d
commit d726d4fb23
2 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
HISTORY.md
View file

@ -1,3 +1,9 @@
0.2.2 / WIP
------------------
- Fixed iOS 5.1 Safary issue with `apply(typed_array)`, #26.
0.2.1 / 2014-05-01 0.2.1 / 2014-05-01
------------------ ------------------

39
lib/utils/strings.js
View file

@ -6,8 +6,15 @@ var utils = require('./common');
// Quick check if we can use fast array to bin string conversion // Quick check if we can use fast array to bin string conversion
//
// - apply(Array) can fail on Android 2.2
// - apply(Uint8Array) can fail on iOS 5.1 Safary
//
var STR_APPLY_OK = true; var STR_APPLY_OK = true;
var STR_APPLY_UIA_OK = true;
try { String.fromCharCode.apply(null, [0]); } catch(__) { STR_APPLY_OK = false; } try { String.fromCharCode.apply(null, [0]); } catch(__) { STR_APPLY_OK = false; }
try { String.fromCharCode.apply(null, new Uint8Array(1)); } catch(__) { STR_APPLY_UIA_OK = false; }
// Table with utf8 lengths (calculated by first byte of sequence) // Table with utf8 lengths (calculated by first byte of sequence)
@ -74,19 +81,26 @@ exports.string2buf = function (str) {
return buf; return buf;
}; };
// Helper (used in 2 places)
// Convert byte array to binary string function buf2binstring(buf, len) {
exports.buf2binstring = function(buf) {
// use fallback for big arrays to avoid stack overflow // use fallback for big arrays to avoid stack overflow
if (STR_APPLY_OK && buf.length < 65537) { if (len < 65537) {
return String.fromCharCode.apply(null, buf); if ((buf.subarray && STR_APPLY_UIA_OK) || (!buf.subarray && STR_APPLY_OK)) {
return String.fromCharCode.apply(null, utils.shrinkBuf(buf, len));
}
} }
var result = ''; var result = '';
for(var i=0, len=buf.length; i < len; i++) { for(var i=0; i < len; i++) {
result += String.fromCharCode(buf[i]); result += String.fromCharCode(buf[i]);
} }
return result; return result;
}
// Convert byte array to binary string
exports.buf2binstring = function(buf) {
return buf2binstring(buf, buf.length);
}; };
@ -102,7 +116,7 @@ exports.binstring2buf = function(str) {
// convert array to string // convert array to string
exports.buf2string = function (buf, max) { exports.buf2string = function (buf, max) {
var str, i, out, c, c_len; var i, out, c, c_len;
var len = max || buf.length; var len = max || buf.length;
// Reserve max possible length (2 words per char) // Reserve max possible length (2 words per char)
@ -139,16 +153,7 @@ exports.buf2string = function (buf, max) {
} }
} }
if (STR_APPLY_OK) { return buf2binstring(utf16buf, out);
return String.fromCharCode.apply(null, utils.shrinkBuf(utf16buf, out));
}
// Fallback, when String.fromCharCode.apply not available
str = '';
for (i=0, len=out; i<len; i++) {
str += String.fromCharCode(utf16buf[i]);
}
return str;
}; };