daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buffer: Don't assign .parent if none exists 

The .parent property of the allocated buffer should remain undefined in
the case that it's not a slice. Also included test to verify this.

PR-URL: https://github.com/iojs/io.js/pull/1109
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
pull/1109/merge
Trevor Norris 2015-03-09 12:28:31 -06:00
parent e795138d55
commit 8070b1ff99
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/buffer.js
View File

@ -141,7 +141,10 @@ function fromJsonObject(that, object) {
function allocate(that, length) { function allocate(that, length) {
var fromPool = length !== 0 && length <= Buffer.poolSize >>> 1; var fromPool = length !== 0 && length <= Buffer.poolSize >>> 1;
that.parent = fromPool ? palloc(that, length) : alloc(that, length); if (fromPool)
that.parent = palloc(that, length);
else
alloc(that, length);
that.length = length; that.length = length;
} }

5
test/parallel/test-buffer.js
View File

@ -1174,3 +1174,8 @@ assert.throws(function() {
// Regression test for https://github.com/iojs/io.js/issues/649. // Regression test for https://github.com/iojs/io.js/issues/649.
assert.throws(function() { Buffer(1422561062959).toString('utf8'); }); assert.throws(function() { Buffer(1422561062959).toString('utf8'); });
var ps = Buffer.poolSize;
Buffer.poolSize = 0;
assert.equal(Buffer(1).parent, undefined);
Buffer.poolSize = ps;