Skip to content

Release proposal: v5.5.1 (Stable) #5141

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
rvagg wants to merge 15 commits into from
Closed

Release proposal: v5.5.1 (Stable) #5141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9e4f94b
doc: add CTC meeting minutes 2016-01-27
rvagg Feb 3, 2016
e325ece
doc: minor improvement in OS docs
estliberitas Jan 31, 2016
28b3928
doc: add CTC meeting minutes 2016-01-20
rvagg Jan 27, 2016
6363264
doc: fix links order in Buffer doc
estliberitas Feb 4, 2016
e05bb40
tools: lint for spacing around unary operators
Trott Feb 3, 2016
d64e6e0
buffer: remove duplicated code in fromObject
entertainyou Jan 29, 2016
f8269fe
querystring: check that maxKeys is finite
Feb 4, 2016
1b49dfb
node_contextify: do not incept debug context
Feb 1, 2016
3effca6
test: mark flaky tests on Raspberry Pi
Trott Feb 4, 2016
3b960af
doc: fix typo in dgram doc
Trott Feb 6, 2016
853d73b
src: clean up usage of __proto__
JacksonTian Feb 4, 2016
fc3c32b
test: fix flaky test-dgram-pingpong
Trott Feb 5, 2016
f513e66
tools: lint for empty character classes in regex
Trott Feb 6, 2016
6f58bc5
doc: console is asynchronous unless it's a file
bnoordhuis Feb 7, 2016
7035d21
2016-02-09, Version 5.5.1 (Stable)
rvagg Feb 8, 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
Prev Previous commit
Next Next commit
buffer: remove duplicated code in fromObject 
Add fromArrayLike() to handle logic of copying in values from array-like
argument.

PR-URL: #4948
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
  • Loading branch information
@entertainyou @rvagg
entertainyou authored and rvagg committed Feb 8, 2016
commit d64e6e0112839cd55e0ba49af83412b46d4b9988
35 changes: 12 additions & 23 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,13 @@ function fromString(string, encoding) {
return b;
}

function fromArrayLike(obj) {
const length = obj.length;
const b = allocate(length);
for (let i = 0; i < length; i++)
b[i] = obj[i] & 255;
return b;
}

function fromObject(obj) {
if (obj instanceof Buffer) {
Expand All @@ -129,14 +136,6 @@ function fromObject(obj) {
return b;
}

if (Array.isArray(obj)) {
const length = obj.length;
const b = allocate(length);
for (let i = 0; i < length; i++)
b[i] = obj[i] & 255;
return b;
}

if (obj == null) {
throw new TypeError('must start with number, buffer, array or string');
}
Expand All @@ -145,25 +144,15 @@ function fromObject(obj) {
return binding.createFromArrayBuffer(obj);
}

if (obj.buffer instanceof ArrayBuffer || obj.length) {
let length;
if (typeof obj.length !== 'number' || obj.length !== obj.length)
length = 0;
else
length = obj.length;
const b = allocate(length);
for (let i = 0; i < length; i++) {
b[i] = obj[i] & 255;
if (obj.buffer instanceof ArrayBuffer || 'length' in obj) {
if (typeof obj.length !== 'number' || obj.length !== obj.length) {
return allocate(0);
}
return b;
return fromArrayLike(obj);
}

if (obj.type === 'Buffer' && Array.isArray(obj.data)) {
var array = obj.data;
const b = allocate(array.length);
for (let i = 0; i < array.length; i++)
b[i] = array[i] & 255;
return b;
return fromArrayLike(obj.data);
}

throw new TypeError('must start with number, buffer, array or string');
Expand Down
7 changes: 7 additions & 0 deletions test/parallel/test-buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ var c = new Buffer(512);
console.log('c.length == %d', c.length);
assert.strictEqual(512, c.length);

var d = new Buffer([]);
assert.strictEqual(0, d.length);

var ui32 = new Uint32Array(4).fill(42);
var e = Buffer(ui32);
assert.deepEqual(ui32, e);

// First check Buffer#fill() works as expected.

assert.throws(function() {
Expand Down