net: make holding the buffer in memory more robust
Set the `req.buffer` property, which serves as a way of keeping a `Buffer` alive that is being written to a stream, on the C++ side instead of the JS side. This closes a hole where buffers that were temporarily created in order to write strings with uncommon encodings (e.g. `hex`) were passed to the native side without being set as `req.buffer`. Fixes: https://github.com/nodejs/node/issues/8251 PR-URL: https://github.com/nodejs/node/pull/8252 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
parent
5bef38b627
commit
4863f6a121
@ -694,7 +694,6 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
|
||||
} else {
|
||||
var enc;
|
||||
if (data instanceof Buffer) {
|
||||
req.buffer = data; // Keep reference alive.
|
||||
enc = 'buffer';
|
||||
} else {
|
||||
enc = encoding;
|
||||
|
@ -69,6 +69,7 @@ namespace node {
|
||||
V(args_string, "args") \
|
||||
V(async, "async") \
|
||||
V(async_queue_string, "_asyncQueue") \
|
||||
V(buffer_string, "buffer") \
|
||||
V(bytes_string, "bytes") \
|
||||
V(bytes_parsed_string, "bytesParsed") \
|
||||
V(bytes_read_string, "bytesRead") \
|
||||
|
@ -227,6 +227,7 @@ int StreamBase::WriteBuffer(const FunctionCallbackInfo<Value>& args) {
|
||||
|
||||
err = DoWrite(req_wrap, bufs, count, nullptr);
|
||||
req_wrap_obj->Set(env->async(), True(env->isolate()));
|
||||
req_wrap_obj->Set(env->buffer_string(), args[1]);
|
||||
|
||||
if (err)
|
||||
req_wrap->Dispose();
|
||||
|
34
test/parallel/test-net-write-fully-async-buffer.js
Normal file
34
test/parallel/test-net-write-fully-async-buffer.js
Normal file
@ -0,0 +1,34 @@
|
||||
'use strict';
|
||||
// Flags: --expose-gc
|
||||
|
||||
// Note: This is a variant of test-net-write-fully-async-hex-string.js.
|
||||
// This always worked, but it seemed appropriate to add a test that checks the
|
||||
// behaviour for Buffers, too.
|
||||
const common = require('../common');
|
||||
const net = require('net');
|
||||
|
||||
const data = Buffer.alloc(1000000);
|
||||
|
||||
const server = net.createServer(common.mustCall(function(conn) {
|
||||
conn.resume();
|
||||
})).listen(0, common.mustCall(function() {
|
||||
const conn = net.createConnection(this.address().port, common.mustCall(() => {
|
||||
let count = 0;
|
||||
|
||||
function writeLoop() {
|
||||
if (count++ === 200) {
|
||||
conn.destroy();
|
||||
server.close();
|
||||
return;
|
||||
}
|
||||
|
||||
while (conn.write(Buffer.from(data)));
|
||||
global.gc(true);
|
||||
// The buffer allocated above should still be alive.
|
||||
}
|
||||
|
||||
conn.on('drain', writeLoop);
|
||||
|
||||
writeLoop();
|
||||
}));
|
||||
}));
|
32
test/parallel/test-net-write-fully-async-hex-string.js
Normal file
32
test/parallel/test-net-write-fully-async-hex-string.js
Normal file
@ -0,0 +1,32 @@
|
||||
'use strict';
|
||||
// Flags: --expose-gc
|
||||
|
||||
// Regression test for https://github.com/nodejs/node/issues/8251.
|
||||
const common = require('../common');
|
||||
const net = require('net');
|
||||
|
||||
const data = Buffer.alloc(1000000).toString('hex');
|
||||
|
||||
const server = net.createServer(common.mustCall(function(conn) {
|
||||
conn.resume();
|
||||
})).listen(0, common.mustCall(function() {
|
||||
const conn = net.createConnection(this.address().port, common.mustCall(() => {
|
||||
let count = 0;
|
||||
|
||||
function writeLoop() {
|
||||
if (count++ === 20) {
|
||||
conn.destroy();
|
||||
server.close();
|
||||
return;
|
||||
}
|
||||
|
||||
while (conn.write(data, 'hex'));
|
||||
global.gc(true);
|
||||
// The buffer allocated inside the .write() call should still be alive.
|
||||
}
|
||||
|
||||
conn.on('drain', writeLoop);
|
||||
|
||||
writeLoop();
|
||||
}));
|
||||
}));
|
Loading…
x
Reference in New Issue
Block a user