Skip to content

buffer: Fixing deopt when constructed with strings #3603

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
tomgco wants to merge 1 commit into from
Closed

buffer: Fixing deopt when constructed with strings #3603

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
11 changes: 6 additions & 5 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function alignPool() {
}


function Buffer(arg) {
function Buffer(arg, encoding) {
// Common case.
if (typeof arg === 'number') {
// If less than zero, or NaN.
Expand All @@ -51,7 +51,11 @@ function Buffer(arg) {

// Slightly less common case.
if (typeof arg === 'string') {
return fromString(arg, arguments[1]);
encoding = encoding || '';
if (typeof encoding !== 'string' || encoding === '')
encoding = 'utf8';

return fromString(arg, encoding);
}

// Unusual.
Expand Down Expand Up @@ -103,9 +107,6 @@ function allocate(size) {


function fromString(string, encoding) {
if (typeof encoding !== 'string' || encoding === '')
encoding = 'utf8';

var length = byteLength(string, encoding);
if (length >= (Buffer.poolSize >>> 1))
return binding.createFromString(string, encoding);
Expand Down