1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

process: fix omitting -- from process.execArgv

Browse Source 
This was essentially a typo that went unnoticed because we
didn’t have tests for this particular situation.

Fixes: https://github.com/nodejs/node/issues/24647

PR-URL: https://github.com/nodejs/node/pull/24654
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
This commit is contained in:
Anna Henningsen 2018-11-26 19:40:09 +09:00 committed by Rich Trott
parent 9efcfd313a
commit 83d6cb98ec
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node_options-inl.h
View File

@ -253,7 +253,7 @@ struct ArgsInfo {
// on the command line (i.e. not generated through alias expansion). // on the command line (i.e. not generated through alias expansion).
// '--' is a special case here since its purpose is to end `exec_argv`, // '--' is a special case here since its purpose is to end `exec_argv`,
// which is why we do not include it. // which is why we do not include it.
if (exec_args != nullptr && first() != "--") if (exec_args != nullptr && ret != "--")
exec_args->push_back(ret); exec_args->push_back(ret);
underlying->erase(underlying->begin() + 1); underlying->erase(underlying->begin() + 1);
} else { } else {

23
test/parallel/test-process-exec-argv.js
View File

@ -27,16 +27,19 @@ const spawn = require('child_process').spawn;
if (process.argv[2] === 'child') { if (process.argv[2] === 'child') {
process.stdout.write(JSON.stringify(process.execArgv)); process.stdout.write(JSON.stringify(process.execArgv));
} else { } else {
const execArgv = ['--stack-size=256']; for (const extra of [ [], [ '--' ] ]) {
const args = [__filename, 'child', 'arg0']; const execArgv = ['--stack-size=256'];
const child = spawn(process.execPath, execArgv.concat(args)); const args = [__filename, 'child', 'arg0'];
let out = ''; const child = spawn(process.execPath, [...execArgv, ...extra, ...args]);
let out = '';
child.stdout.on('data', function(chunk) { child.stdout.setEncoding('utf8');
out += chunk; child.stdout.on('data', function(chunk) {
}); out += chunk;
});
child.on('close', function() { child.on('close', function() {
assert.deepStrictEqual(JSON.parse(out), execArgv); assert.deepStrictEqual(JSON.parse(out), execArgv);
}); });
}
} }