Skip to content

buffer: fix fill with encoding in Buffer.alloc() #9238

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
not-an-aardvark wants to merge 5 commits into from
Closed

buffer: fix fill with encoding in Buffer.alloc() #9238

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c31be42
buffer: fix `fill` with encoding in Buffer.alloc()
not-an-aardvark Oct 22, 2016
275b17b
squash: use Buffer.from
not-an-aardvark Oct 22, 2016
54c9dad
squash: link to GitHub issue in comment
not-an-aardvark Oct 22, 2016
90af46a
squash: ensure Buffer.alloc is inlineable
not-an-aardvark Oct 22, 2016
baad1f6
squash: fix comment typo
not-an-aardvark Oct 22, 2016
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
6 changes: 5 additions & 1 deletion lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ Buffer.alloc = function(size, fill, encoding) {
if (typeof fill !== 'number' && typeof encoding === 'string')
fill = Buffer.from(fill, encoding);

return createBuffer(size, true).fill(fill);
const buf = createBuffer(size, true);
// Buffer.prototype.fill does not support filling with other buffers in v4.
// Instead, call binding.fill directly.
binding.fill(buf, fill, 0, buf.length);
return buf;
}
return createBuffer(size);
};
Expand Down
11 changes: 11 additions & 0 deletions test/parallel/test-buffer-alloc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,17 @@ assert.throws(function() {
Buffer.allocUnsafe(0xFFFFFFFFF);
}, RangeError);

// issue GH-9226
Copy link
Contributor

@mscdex mscdex Oct 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might be better to provide a URL instead (or at least in addition).

{
const buf = Buffer.alloc(4, 'YQ==', 'base64');
const expectedBuf = new Buffer([97, 97, 97, 97]);
Copy link
Contributor

@mscdex mscdex Oct 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't this be Buffer.from() instead?

Copy link
Contributor Author

@not-an-aardvark not-an-aardvark Oct 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea; I had been under the impression that Buffer.from() had different behavior in v4, but it seems like that's not an issue here.

assert(buf.equals(expectedBuf));
}
{
const buf = Buffer.alloc(4, 'ab', 'ascii');
const expectedBuf = new Buffer([97, 98, 97, 98]);
Copy link
Contributor

@mscdex mscdex Oct 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

assert(buf.equals(expectedBuf));
}

// attempt to overflow buffers, similar to previous bug in array buffers
assert.throws(function() {
Expand Down