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

child_process: make copy of options arg

Browse Source 
Make a copy of the options object that the user passes in, we modify it.
This commit is contained in:
Ben Noordhuis 2012-05-10 16:54:17 +02:00
parent 928d28a7b3
commit 68f63fe9ec
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/child_process.js
View File

@ -172,10 +172,10 @@ exports.fork = function(modulePath /*, args, options*/) {
var options, args, execArgv; var options, args, execArgv;
if (Array.isArray(arguments[1])) { if (Array.isArray(arguments[1])) {
args = arguments[1]; args = arguments[1];
options = arguments[2] || {}; options = util._extend({}, arguments[2]);
} else { } else {
args = []; args = [];
options = arguments[1] || {}; options = util._extend({}, arguments[1]);
} }
// Prepare arguments for fork: // Prepare arguments for fork:
@ -264,15 +264,12 @@ exports.execFile = function(file /* args, options, callback */) {
if (Array.isArray(arguments[1])) { if (Array.isArray(arguments[1])) {
args = arguments[1]; args = arguments[1];
if (typeof arguments[2] === 'object') optionArg = arguments[2]; options = util._extend(options, arguments[2]);
} else { } else {
args = []; args = [];
if (typeof arguments[1] === 'object') optionArg = arguments[1]; options = util._extend(options, arguments[1]);
} }
// Merge optionArg into options
util._extend(options, optionArg);
var child = spawn(file, args, { var child = spawn(file, args, {
cwd: options.cwd, cwd: options.cwd,
env: options.env, env: options.env,