child_process: spawn() does not throw TypeError

Ensure TypeError is thrown, fix a bug where `env` option was
assuming the option was actually an object.

This case is especially bad because it then sets `env == null`
instead of using `process.env`.

Fix #7456

Signed-off-by: Fedor Indutny <fedor@indutny.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/child_process.js b/lib/child_process.js
index 70893e0a3c..5e3eeaf02e 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -710,6 +710,10 @@ var spawn = exports.spawn = function(file /*, args, options*/) {
   if (Array.isArray(arguments[1])) {
     args = arguments[1].slice(0);
     options = arguments[2];
+  } else if (arguments[1] && !Array.isArray(arguments[1])) {
+    args = [];
+    options = arguments[2];
+    throw new TypeError('Incorrect value of args option');
   } else {
     args = [];
     options = arguments[1];
@@ -717,7 +721,7 @@ var spawn = exports.spawn = function(file /*, args, options*/) {
 
   args.unshift(file);
 
-  var env = (options ? options.env : null) || process.env;
+  var env = (options && options.env ? options.env : null) || process.env;
   var envPairs = [];
   for (var key in env) {
     envPairs.push(key + '=' + env[key]);