Skip to content

Commit

Permalink
child_process: fix leak when passing http sockets
Browse files Browse the repository at this point in the history
After passing an HTTP socket, release its associated resources.

PR-URL: #20305
Fixes: #15651
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
santigimeno authored and BridgeAR committed Apr 29, 2018
1 parent 60b5b38 commit 511230f
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 0 deletions.
10 changes: 10 additions & 0 deletions lib/internal/child_process.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ const SocketList = require('internal/socket_list');
const { convertToValidSignal } = require('internal/util');
const { isUint8Array } = require('internal/util/types');
const spawn_sync = process.binding('spawn_sync');
const { HTTPParser } = process.binding('http_parser');
const { freeParser } = require('_http_common');

const {
UV_EACCES,
Expand Down Expand Up @@ -107,6 +109,14 @@ const handleConversion = {
if (!options.keepOpen) {
handle.onread = nop;
socket._handle = null;
socket.setTimeout(0);
// In case of an HTTP connection socket, release the associated
// resources
if (socket.parser && socket.parser instanceof HTTPParser) {
freeParser(socket.parser, null, socket);
if (socket._httpMessage)
socket._httpMessage.detachSocket(socket);
}
}

return handle;
Expand Down
56 changes: 56 additions & 0 deletions test/parallel/test-child-process-http-socket-leak.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// Flags: --expose_internals

'use strict';

const common = require('../common');
const assert = require('assert');
const { fork } = require('child_process');
const http = require('http');
const { kTimeout } = require('internal/timers');

if (process.argv[2] === 'child') {
process.once('message', (req, socket) => {
const res = new http.ServerResponse(req);
res.assignSocket(socket);
res.end();
});

process.send('ready');
return;
}

let child;
let socket;

const server = http.createServer(common.mustCall((req, res) => {
const r = {
method: req.method,
headers: req.headers,
path: req.path,
httpVersionMajor: req.httpVersionMajor,
query: req.query,
};

socket = res.socket;
child.send(r, socket);
server.close();
}));

server.listen(0, common.mustCall(() => {
child = fork(__filename, [ 'child' ]);
child.once('message', (msg) => {
assert.strictEqual(msg, 'ready');
const req = http.request({
port: server.address().port,
}, common.mustCall((res) => {
res.on('data', () => {});
res.on('end', common.mustCall(() => {
assert.strictEqual(socket[kTimeout]._idleTimeout, -1);
assert.strictEqual(socket.parser, null);
assert.strictEqual(socket._httpMessage, null);
}));
}));

req.end();
});
}));

0 comments on commit 511230f

Please sign in to comment.