nodejs
diff --git a/‎lib/child_process.js‎
Lines changed: 5 additions & 0 deletions b/‎lib/child_process.js‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎test/fixtures/child-process-echo-options.js‎
Lines changed: 1 addition & 0 deletions b/‎test/fixtures/child-process-echo-options.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎test/parallel/test-child-process-fork-options.js‎
Lines changed: 37 additions & 0 deletions b/‎test/parallel/test-child-process-fork-options.js‎
Lines changed: 37 additions & 0 deletions
@@ -65,6 +65,11 @@ exports.fork = function(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 TypeError('Incorrect value of args option');
 
@@ -0,0 +1 @@
+process.send({ env: process.env });
@@ -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);
+  }));
+}