5 files changed, 56 insertions, 24 deletions

diff --git a/lib/child_process.js b/lib/child_process.js
index 6fe5351fd6..e9cf426b9e 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -146,6 +146,12 @@ exports.execFile = function(file /*, args, options, callback*/) {
     throw new TypeError('Incorrect value of args option');
   }
 
+  // Validate the timeout, if present.
+  validateTimeout(options.timeout);
+
+  // Validate maxBuffer, if present.
+  validateMaxBuffer(options.maxBuffer);
+
   var child = spawn(file, args, {
     cwd: options.cwd,
     env: options.env,
@@ -466,31 +472,17 @@ function spawnSync(/*file, args, options*/) {
   debug('spawnSync', opts.args, options);
 
   // Validate the timeout, if present.
-  if (options.timeout != null &&
-      !(Number.isInteger(options.timeout) && options.timeout >= 0)) {
-    throw new TypeError('"timeout" must be an unsigned integer');
-  }
+  validateTimeout(options.timeout);
 
   // Validate maxBuffer, if present.
-  if (options.maxBuffer != null &&
-      !(Number.isInteger(options.maxBuffer) && options.maxBuffer >= 0)) {
-    throw new TypeError('"maxBuffer" must be an unsigned integer');
-  }
+  validateMaxBuffer(options.maxBuffer);
 
   options.file = opts.file;
   options.args = opts.args;
   options.envPairs = opts.envPairs;
 
-  // Validate the kill signal, if present.
-  if (typeof options.killSignal === 'string' ||
-      typeof options.killSignal === 'number') {
-    options.killSignal = lookupSignal(options.killSignal);
-
-    if (options.killSignal === 0)
-      throw new RangeError('"killSignal" cannot be 0');
-  } else if (options.killSignal != null) {
-    throw new TypeError('"killSignal" must be a string or number');
-  }
+  // Validate and translate the kill signal, if present.
+  options.killSignal = validateKillSignal(options.killSignal);
 
   options.stdio = _validateStdio(options.stdio || 'pipe', true).stdio;
 
@@ -600,3 +592,31 @@ function execSync(command /*, options*/) {
     return ret.stdout;
 }
 exports.execSync = execSync;
+
+
+function validateTimeout(timeout) {
+  if (timeout != null && !(Number.isInteger(timeout) && timeout >= 0)) {
+    throw new TypeError('"timeout" must be an unsigned integer');
+  }
+}
+
+
+function validateMaxBuffer(maxBuffer) {
+  if (maxBuffer != null && !(typeof maxBuffer === 'number' && maxBuffer >= 0)) {
+    throw new TypeError('"maxBuffer" must be a positive number');
+  }
+}
+
+
+function validateKillSignal(killSignal) {
+  if (typeof killSignal === 'string' || typeof killSignal === 'number') {
+    killSignal = lookupSignal(killSignal);
+
+    if (killSignal === 0)
+      throw new RangeError('"killSignal" cannot be 0');
+  } else if (killSignal != null) {
+    throw new TypeError('"killSignal" must be a string or number');
+  }
+
+  return killSignal;
+}
diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc
index 68e7814757..93e51af38f 100644
--- a/src/spawn_sync.cc
+++ b/src/spawn_sync.cc
@@ -765,8 +765,8 @@ int SyncProcessRunner::ParseOptions(Local<Value> js_value) {
 
   Local<Value> js_max_buffer = js_options->Get(env()->max_buffer_string());
   if (IsSet(js_max_buffer)) {
-    CHECK(js_max_buffer->IsUint32());
-    max_buffer_ = js_max_buffer->Uint32Value();
+    CHECK(js_max_buffer->IsNumber());
+    max_buffer_ = js_max_buffer->NumberValue();
   }
 
   Local<Value> js_kill_signal = js_options->Get(env()->kill_signal_string());
diff --git a/src/spawn_sync.h b/src/spawn_sync.h
index 8f4c05aa5f..676df43b75 100644
--- a/src/spawn_sync.h
+++ b/src/spawn_sync.h
@@ -184,7 +184,7 @@ class SyncProcessRunner {
   static void KillTimerCallback(uv_timer_t* handle);
   static void KillTimerCloseCallback(uv_handle_t* handle);
 
-  size_t max_buffer_;
+  double max_buffer_;
   uint64_t timeout_;
   int kill_signal_;
 
diff --git a/test/parallel/test-child-process-exec-maxBuffer.js b/test/parallel/test-child-process-exec-maxBuffer.js
index 714e029d72..65674a8503 100644
--- a/test/parallel/test-child-process-exec-maxBuffer.js
+++ b/test/parallel/test-child-process-exec-maxBuffer.js
@@ -11,6 +11,17 @@ function checkFactory(streamName) {
 }
 
 {
+  const cmd = `"${process.execPath}" -e "console.log('hello world');"`;
+  const options = { maxBuffer: Infinity };
+
+  cp.exec(cmd, options, common.mustCall((err, stdout, stderr) => {
+    assert.ifError(err);
+    assert.strictEqual(stdout.trim(), 'hello world');
+    assert.strictEqual(stderr, '');
+  }));
+}
+
+{
   const cmd = 'echo "hello world"';
 
   cp.exec(cmd, { maxBuffer: 5 }, checkFactory('stdout'));
diff --git a/test/parallel/test-child-process-spawnsync-validation-errors.js b/test/parallel/test-child-process-spawnsync-validation-errors.js
index e101376248..8260e15512 100644
--- a/test/parallel/test-child-process-spawnsync-validation-errors.js
+++ b/test/parallel/test-child-process-spawnsync-validation-errors.js
@@ -163,16 +163,17 @@ if (!common.isWindows) {
 
 {
   // Validate the maxBuffer option
-  const err = /^TypeError: "maxBuffer" must be an unsigned integer$/;
+  const err = /^TypeError: "maxBuffer" must be a positive number$/;
 
   pass('maxBuffer', undefined);
   pass('maxBuffer', null);
   pass('maxBuffer', 1);
   pass('maxBuffer', 0);
-  fail('maxBuffer', 3.14, err);
+  pass('maxBuffer', Infinity);
+  pass('maxBuffer', 3.14);
   fail('maxBuffer', -1, err);
   fail('maxBuffer', NaN, err);
-  fail('maxBuffer', Infinity, err);
+  fail('maxBuffer', -Infinity, err);
   fail('maxBuffer', true, err);
   fail('maxBuffer', false, err);
   fail('maxBuffer', __dirname, err);