nodejs
diff --git a/‎lib/child_process.js‎
Lines changed: 2 additions & 2 deletions b/‎lib/child_process.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/sequential/test-child-process-execsync.js‎
Lines changed: 12 additions & 0 deletions b/‎test/sequential/test-child-process-execsync.js‎
Lines changed: 12 additions & 0 deletions
@@ -489,7 +489,7 @@ function execFileSync(/*command, args, options*/) {
 
   var ret = spawnSync(opts.file, opts.args.slice(1), opts.options);
 
-  if (inheritStderr)
+  if (inheritStderr && ret.stderr)
     process.stderr.write(ret.stderr);
 
   var err = checkExecSyncError(ret);
@@ -509,7 +509,7 @@ function execSync(command /*, options*/) {
   var ret = spawnSync(opts.file, opts.options);
   ret.cmd = command;
 
-  if (inheritStderr)
+  if (inheritStderr && ret.stderr)
     process.stderr.write(ret.stderr);
 
   var err = checkExecSyncError(ret);
 
@@ -12,6 +12,18 @@ var start = Date.now();
 var err;
 var caught = false;
 
+// Verify that stderr is not accessed when a bad shell is used
+assert.throws(
+  function() { execSync('exit -1', {shell: 'bad_shell'}); },
+  /spawnSync bad_shell ENOENT/,
+  'execSync did not throw the expected exception!'
+);
+assert.throws(
+  function() { execFileSync('exit -1', {shell: 'bad_shell'}); },
+  /spawnSync bad_shell ENOENT/,
+  'execFileSync did not throw the expected exception!'
+);
+
 try {
   var cmd = `"${process.execPath}" -e "setTimeout(function(){}, ${SLEEP});"`;
   var ret = execSync(cmd, {timeout: TIMER});