Skip to content
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

Jump to bottom

lib: fix max size check in Buffer constructor #657

Merged
merged 1 commit into from
Jan 31, 2015
Merged

lib: fix max size check in Buffer constructor #657

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function Buffer(subject, encoding) {
return new Buffer(subject, encoding);

if (util.isNumber(subject)) {
this.length = subject > 0 ? subject >>> 0 : 0;
this.length = +subject;

} else if (util.isString(subject)) {
if (!util.isString(encoding) || encoding.length === 0)
Expand All @@ -42,8 +42,7 @@ function Buffer(subject, encoding) {
} else if (util.isObject(subject)) {
if (subject.type === 'Buffer' && util.isArray(subject.data))
subject = subject.data;
// Must use floor() because array length may be > kMaxLength.
this.length = +subject.length > 0 ? Math.floor(+subject.length) : 0;
this.length = +subject.length;

} else {
throw new TypeError('must start with number, buffer, array or string');
Expand All @@ -54,6 +53,11 @@ function Buffer(subject, encoding) {
'size: 0x' + kMaxLength.toString(16) + ' bytes');
}

if (this.length < 0)
this.length = 0;
else
this.length >>>= 0; // Coerce to uint32.

this.parent = undefined;
if (this.length <= (Buffer.poolSize >>> 1) && this.length > 0) {
if (this.length > poolSize - poolOffset)
Expand Down
3 changes: 3 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 @@ -1163,3 +1163,6 @@ assert.throws(function() {
var b = new Buffer(1);
b.equals('abc');
});

// Regression test for https://github.com/iojs/io.js/issues/649.
assert.throws(function() { Buffer(1422561062959).toString('utf8'); });