mirror of
https://github.com/nodejs/node.git
synced 2025-08-15 21:58:48 +02:00
lib: fix max size check in Buffer constructor
A number -> uint32 type coercion bug made buffer sizes larger than kMaxLength (0x3fffffff) wrap around. Instead of rejecting the requested size with an exception, the constructor created a buffer with the wrong size. PR-URL: https://github.com/iojs/io.js/pull/657 Reviewed-By: Trevor Norris <trev.norris@gmail.com>
This commit is contained in:
parent
65b1e4f56f
commit
0767c2feb1
2 changed files with 10 additions and 3 deletions
|
@ -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)
|
||||
|
@ -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');
|
||||
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue