From 99cfd53097ef646e0e61a0690c9b80ff9ae80d68 Mon Sep 17 00:00:00 2001
From: Chuck Langford <field.email@gmail.com>
Date: Wed, 30 Dec 2015 16:27:56 -0500
Subject: [PATCH] test: test execFile/fork arg validation

Fixes: https://github.com/nodejs/node/issues/2681
Refs: https://github.com/nodejs/node/pull/4508
PR-URL: https://github.com/nodejs/node/pull/7399
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/child_process.js                          |  4 +--
 .../test-child-process-spawn-typeerror.js     | 35 +++++++++++++++++--
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/lib/child_process.js b/lib/child_process.js
index d9be79925850b4..003f6569fa0792 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -23,11 +23,11 @@ exports.fork = function(modulePath /*, args, options*/) {
   var options = {};
   var args = [];
   var pos = 1;
-  if (Array.isArray(arguments[pos])) {
+  if (pos < arguments.length && Array.isArray(arguments[pos])) {
     args = arguments[pos++];
   }
 
-  if (arguments[pos] != null) {
+  if (pos < arguments.length && arguments[pos] != null) {
     if (typeof arguments[pos] !== 'object') {
       throw new TypeError('Incorrect value of args option');
     } else {
diff --git a/test/parallel/test-child-process-spawn-typeerror.js b/test/parallel/test-child-process-spawn-typeerror.js
index bf59779a75ff5d..20b6e4691055f4 100644
--- a/test/parallel/test-child-process-spawn-typeerror.js
+++ b/test/parallel/test-child-process-spawn-typeerror.js
@@ -111,13 +111,36 @@ assert.doesNotThrow(function() { execFile(cmd, a, o, u); });
 assert.doesNotThrow(function() { execFile(cmd, n, o, c); });
 assert.doesNotThrow(function() { execFile(cmd, a, n, c); });
 assert.doesNotThrow(function() { execFile(cmd, a, o, n); });
+assert.doesNotThrow(function() { execFile(cmd, u, u, u); });
+assert.doesNotThrow(function() { execFile(cmd, u, u, c); });
+assert.doesNotThrow(function() { execFile(cmd, u, o, u); });
+assert.doesNotThrow(function() { execFile(cmd, a, u, u); });
+assert.doesNotThrow(function() { execFile(cmd, n, n, n); });
+assert.doesNotThrow(function() { execFile(cmd, n, n, c); });
+assert.doesNotThrow(function() { execFile(cmd, n, o, n); });
+assert.doesNotThrow(function() { execFile(cmd, a, n, n); });
+assert.doesNotThrow(function() { execFile(cmd, a, u); });
+assert.doesNotThrow(function() { execFile(cmd, a, n); });
+assert.doesNotThrow(function() { execFile(cmd, o, u); });
+assert.doesNotThrow(function() { execFile(cmd, o, n); });
+assert.doesNotThrow(function() { execFile(cmd, c, u); });
+assert.doesNotThrow(function() { execFile(cmd, c, n); });
 
 // string is invalid in arg position (this may seem strange, but is
 // consistent across node API, cf. `net.createServer('not options', 'not
 // callback')`
 assert.throws(function() { execFile(cmd, s, o, c); }, TypeError);
-assert.doesNotThrow(function() { execFile(cmd, a, s, c); });
-assert.doesNotThrow(function() { execFile(cmd, a, o, s); });
+assert.throws(function() { execFile(cmd, a, s, c); }, TypeError);
+assert.throws(function() { execFile(cmd, a, o, s); }, TypeError);
+assert.throws(function() { execFile(cmd, a, s); }, TypeError);
+assert.throws(function() { execFile(cmd, o, s); }, TypeError);
+assert.throws(function() { execFile(cmd, u, u, s); }, TypeError);
+assert.throws(function() { execFile(cmd, n, n, s); }, TypeError);
+assert.throws(function() { execFile(cmd, a, u, s); }, TypeError);
+assert.throws(function() { execFile(cmd, a, n, s); }, TypeError);
+assert.throws(function() { execFile(cmd, u, o, s); }, TypeError);
+assert.throws(function() { execFile(cmd, n, o, s); }, TypeError);
+assert.doesNotThrow(function() { execFile(cmd, c, s); });
 
 
 // verify that fork has same argument parsing behaviour as spawn
@@ -131,6 +154,12 @@ assert.doesNotThrow(function() { fork(empty); });
 assert.doesNotThrow(function() { fork(empty, a); });
 assert.doesNotThrow(function() { fork(empty, a, o); });
 assert.doesNotThrow(function() { fork(empty, o); });
+assert.doesNotThrow(function() { fork(empty, u, u); });
+assert.doesNotThrow(function() { fork(empty, u, o); });
+assert.doesNotThrow(function() { fork(empty, a, u); });
+assert.doesNotThrow(function() { fork(empty, n, n); });
+assert.doesNotThrow(function() { fork(empty, n, o); });
+assert.doesNotThrow(function() { fork(empty, a, n); });
 
 assert.throws(function() { fork(empty, s); }, TypeError);
-assert.doesNotThrow(function() { fork(empty, a, s); }, TypeError);
+assert.throws(function() { fork(empty, a, s); }, TypeError);