child_process: handle undefined/null for fork() args

PR-URL: https://github.com/nodejs/node/pull/22416
Fixes: https://github.com/nodejs/node/issues/20749
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Matheus Marchini <mat@mmarchini.me>
This commit is contained in:
Shobhit Chittora 2018-08-20 21:32:31 +05:30 committed by Rich Trott
parent 22f7d0a4bd
commit 0d9d32ad15
3 changed files with 43 additions and 0 deletions

View File

@ -69,6 +69,11 @@ exports.fork = function fork(modulePath /* , args, options */) {
args = arguments[pos++];
}
if (pos < arguments.length &&
(arguments[pos] === undefined || arguments[pos] === null)) {
pos++;
}
if (pos < arguments.length && arguments[pos] != null) {
if (typeof arguments[pos] !== 'object') {
throw new ERR_INVALID_ARG_VALUE(`arguments[${pos}]`, arguments[pos]);

View File

@ -0,0 +1 @@
process.send({ env: process.env });

View File

@ -0,0 +1,37 @@
'use strict';
const common = require('../common');
const fixtures = require('../common/fixtures');
// This test ensures that fork should parse options
// correctly if args is undefined or null
const assert = require('assert');
const { fork } = require('child_process');
const expectedEnv = { foo: 'bar' };
{
const cp = fork(fixtures.path('child-process-echo-options.js'), undefined,
{ env: Object.assign({}, process.env, expectedEnv) });
cp.on('message', common.mustCall(({ env }) => {
assert.strictEqual(env.foo, expectedEnv.foo);
}));
cp.on('exit', common.mustCall((code) => {
assert.strictEqual(code, 0);
}));
}
{
const cp = fork(fixtures.path('child-process-echo-options.js'), null,
{ env: Object.assign({}, process.env, expectedEnv) });
cp.on('message', common.mustCall(({ env }) => {
assert.strictEqual(env.foo, expectedEnv.foo);
}));
cp.on('exit', common.mustCall((code) => {
assert.strictEqual(code, 0);
}));
}