string_decoder
Advanced tools
Comparing version 0.10.25 to 0.10.31
75
index.js
@@ -39,2 +39,10 @@ // Copyright Joyent, Inc. and other Node contributors. | ||
// StringDecoder provides an interface for efficiently splitting a series of | ||
// buffers into a series of JS strings without breaking apart multi-byte | ||
// characters. CESU-8 is handled as part of the UTF-8 encoding. | ||
// | ||
// @TODO Handling all encodings inside a single object makes it very difficult | ||
// to reason about this code, so it should be split up in the future. | ||
// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code | ||
// points as used by CESU-8. | ||
var StringDecoder = exports.StringDecoder = function(encoding) { | ||
@@ -64,4 +72,8 @@ this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, ''); | ||
// Enough space to store all bytes of a single character. UTF-8 needs 4 | ||
// bytes, but CESU-8 may require up to 6 (3 bytes per surrogate). | ||
this.charBuffer = new Buffer(6); | ||
// Number of bytes received for the current incomplete multi-byte character. | ||
this.charReceived = 0; | ||
// Number of bytes expected for the current incomplete multi-byte character. | ||
this.charLength = 0; | ||
@@ -71,17 +83,23 @@ }; | ||
// write decodes the given buffer and returns it as JS string that is | ||
// guaranteed to not contain any partial multi-byte characters. Any partial | ||
// character found at the end of the buffer is buffered up, and will be | ||
// returned when calling write again with the remaining bytes. | ||
// | ||
// Note: Converting a Buffer containing an orphan surrogate to a String | ||
// currently works, but converting a String to a Buffer (via `new Buffer`, or | ||
// Buffer#write) will replace incomplete surrogates with the unicode | ||
// replacement character. See https://codereview.chromium.org/121173009/ . | ||
StringDecoder.prototype.write = function(buffer) { | ||
var charStr = ''; | ||
var offset = 0; | ||
// if our last write ended with an incomplete multibyte character | ||
while (this.charLength) { | ||
// determine how many remaining bytes this buffer has to offer for this char | ||
var i = (buffer.length >= this.charLength - this.charReceived) ? | ||
this.charLength - this.charReceived : | ||
buffer.length; | ||
var available = (buffer.length >= this.charLength - this.charReceived) ? | ||
this.charLength - this.charReceived : | ||
buffer.length; | ||
// add the new bytes to the char buffer | ||
buffer.copy(this.charBuffer, this.charReceived, offset, i); | ||
this.charReceived += (i - offset); | ||
offset = i; | ||
buffer.copy(this.charBuffer, this.charReceived, 0, available); | ||
this.charReceived += available; | ||
@@ -93,6 +111,9 @@ if (this.charReceived < this.charLength) { | ||
// remove bytes belonging to the current character from the buffer | ||
buffer = buffer.slice(available, buffer.length); | ||
// get the character that was split | ||
charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding); | ||
// lead surrogate (D800-DBFF) is also the incomplete character | ||
// CESU-8: lead surrogate (D800-DBFF) is also the incomplete character | ||
var charCode = charStr.charCodeAt(charStr.length - 1); | ||
@@ -107,10 +128,10 @@ if (charCode >= 0xD800 && charCode <= 0xDBFF) { | ||
// if there are no more bytes in this buffer, just emit our char | ||
if (i == buffer.length) return charStr; | ||
// otherwise cut off the characters end from the beginning of this buffer | ||
buffer = buffer.slice(i, buffer.length); | ||
if (buffer.length === 0) { | ||
return charStr; | ||
} | ||
break; | ||
} | ||
var lenIncomplete = this.detectIncompleteChar(buffer); | ||
// determine and set charLength / charReceived | ||
this.detectIncompleteChar(buffer); | ||
@@ -120,5 +141,4 @@ var end = buffer.length; | ||
// buffer the incomplete character bytes we got | ||
buffer.copy(this.charBuffer, 0, buffer.length - lenIncomplete, end); | ||
this.charReceived = lenIncomplete; | ||
end -= lenIncomplete; | ||
buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end); | ||
end -= this.charReceived; | ||
} | ||
@@ -130,3 +150,3 @@ | ||
var charCode = charStr.charCodeAt(end); | ||
// lead surrogate (D800-DBFF) is also the incomplete character | ||
// CESU-8: lead surrogate (D800-DBFF) is also the incomplete character | ||
if (charCode >= 0xD800 && charCode <= 0xDBFF) { | ||
@@ -137,3 +157,3 @@ var size = this.surrogateSize; | ||
this.charBuffer.copy(this.charBuffer, size, 0, size); | ||
this.charBuffer.write(charStr.charAt(charStr.length - 1), this.encoding); | ||
buffer.copy(this.charBuffer, 0, 0, size); | ||
return charStr.substring(0, end); | ||
@@ -146,2 +166,6 @@ } | ||
// detectIncompleteChar determines if there is an incomplete UTF-8 character at | ||
// the end of the given buffer. If so, it sets this.charLength to the byte | ||
// length that character, and sets this.charReceived to the number of bytes | ||
// that are available for this character. | ||
StringDecoder.prototype.detectIncompleteChar = function(buffer) { | ||
@@ -176,4 +200,3 @@ // determine how many bytes we have to check at the end of this buffer | ||
} | ||
return i; | ||
this.charReceived = i; | ||
}; | ||
@@ -201,11 +224,9 @@ | ||
function utf16DetectIncompleteChar(buffer) { | ||
var incomplete = this.charReceived = buffer.length % 2; | ||
this.charLength = incomplete ? 2 : 0; | ||
return incomplete; | ||
this.charReceived = buffer.length % 2; | ||
this.charLength = this.charReceived ? 2 : 0; | ||
} | ||
function base64DetectIncompleteChar(buffer) { | ||
var incomplete = this.charReceived = buffer.length % 3; | ||
this.charLength = incomplete ? 3 : 0; | ||
return incomplete; | ||
this.charReceived = buffer.length % 3; | ||
this.charLength = this.charReceived ? 3 : 0; | ||
} |
{ | ||
"name": "string_decoder", | ||
"version": "0.10.25", | ||
"version": "0.10.31", | ||
"description": "The string_decoder module from Node core", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
Sorry, the diff of this file is not supported yet
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Network access
Supply chain riskThis module accesses the network.
Found 4 instances in 1 package
Shell access
Supply chain riskThis module accesses the system shell. Accessing the system shell increases the risk of executing arbitrary code.
Found 1 instance in 1 package
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
Environment variable access
Supply chain riskPackage accesses environment variables, which may be a sign of credential stuffing or data theft.
Found 3 instances in 1 package
Filesystem access
Supply chain riskAccesses the file system, and could potentially read sensitive data.
Found 1 instance in 1 package
Mixed license
License(Experimental) Package contains multiple licenses.
Found 1 instance in 1 package
Non-permissive License
License(Experimental) A license not known to be considered permissive was found
Found 1 instance in 1 package
Unidentified License
License(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license
Found 2 instances in 1 package
0
100
0
1
9900
5
190