Skip to content

buffer: avoid use of arguments #11358

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

Closed
jasnell wants to merge 2 commits into from
Closed

buffer: avoid use of arguments #11358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97e336e
buffer: avoid use of arguments
jasnell Feb 13, 2017
f20117f
buffer: refactor slowToString
jasnell Feb 15, 2017
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
28 changes: 14 additions & 14 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,10 +433,10 @@ Object.defineProperty(Buffer.prototype, 'offset', {
});


function slowToString(encoding, start, end) {
function slowToString(buf, encoding, start, end) {
var loweredCase = false;

// No need to verify that "this.length <= MAX_UINT32" since it's a read-only
// No need to verify that "buf.length <= MAX_UINT32" since it's a read-only
// property of a typed array.

// This behaves neither like String nor Uint8Array in that we set start/end
Expand All @@ -445,13 +445,13 @@ function slowToString(encoding, start, end) {
// Section 13.3.3.7 Runtime Semantics: KeyedBindingInitialization.
if (start === undefined || start < 0)
start = 0;
// Return early if start > this.length. Done here to prevent potential uint32
// Return early if start > buf.length. Done here to prevent potential uint32
// coercion fail below.
if (start > this.length)
if (start > buf.length)
return '';

if (end === undefined || end > this.length)
end = this.length;
if (end === undefined || end > buf.length)
end = buf.length;

if (end <= 0)
return '';
Expand All @@ -468,27 +468,27 @@ function slowToString(encoding, start, end) {
while (true) {
switch (encoding) {
case 'hex':
return this.hexSlice(start, end);
return buf.hexSlice(start, end);

case 'utf8':
case 'utf-8':
return this.utf8Slice(start, end);
return buf.utf8Slice(start, end);

case 'ascii':
return this.asciiSlice(start, end);
return buf.asciiSlice(start, end);

case 'latin1':
case 'binary':
return this.latin1Slice(start, end);
return buf.latin1Slice(start, end);

case 'base64':
return this.base64Slice(start, end);
return buf.base64Slice(start, end);

case 'ucs2':
case 'ucs-2':
case 'utf16le':
case 'utf-16le':
return this.ucs2Slice(start, end);
return buf.ucs2Slice(start, end);

default:
if (loweredCase)
Expand All @@ -503,12 +503,12 @@ Buffer.prototype.copy = function(target, targetStart, sourceStart, sourceEnd) {
return binding.copy(this, target, targetStart, sourceStart, sourceEnd);
};

Buffer.prototype.toString = function() {
Buffer.prototype.toString = function(encoding, start, end) {
let result;
if (arguments.length === 0) {
result = this.utf8Slice(0, this.length);
} else {
result = slowToString.apply(this, arguments);
result = slowToString(this, encoding, start, end);
}
if (result === undefined)
throw new Error('"toString()" failed');
Expand Down