From fdc9090c85409c77df16cfbd9e1403e847d6a815 Mon Sep 17 00:00:00 2001
From: Sarat Addepalli <sarat.addepalli@paytm.com>
Date: Mon, 20 Aug 2018 12:41:40 +0530
Subject: [PATCH 1/2] child_process: allow typed arrays for input

doc:    Update child_process docs, stating typed arrays are allowed.
error:  Update error message for `ERR_INVALID_SYNC_FORK_INPUT`
lib:    Use isArrayBufferView instead of isUint8Array
test:   Update test-child-process-spawnsync-input to test for all
        typed arrays and data view.
---
 doc/api/child_process.md                      | 27 ++++++++++++++-----
 doc/api/errors.md                             |  4 +--
 lib/child_process.js                          |  9 ++++---
 lib/internal/child_process.js                 |  4 +--
 lib/internal/errors.js                        |  3 ++-
 .../test-child-process-spawnsync-input.js     | 21 +++++++++------
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/doc/api/child_process.md b/doc/api/child_process.md
index d6a79421889a1e..90fa81313d4218 100644
--- a/doc/api/child_process.md
+++ b/doc/api/child_process.md
@@ -688,6 +688,10 @@ configuration at startup.
 <!-- YAML
 added: v0.11.12
 changes:
+  - version: REPLACEME
+    pr-url: REPLACEME
+    description: The `input` option can now be any `TypedArray` or a
+                 `DataView`.
   - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/21316
     description: The `windowsHide` option now defaults to `true`.
@@ -706,8 +710,9 @@ changes:
 * `args` {string[]} List of string arguments.
 * `options` {Object}
   * `cwd` {string} Current working directory of the child process.
-  * `input` {string|Buffer|Uint8Array} The value which will be passed as stdin
-    to the spawned process. Supplying this value will override `stdio[0]`.
+  * `input` {string|Buffer|TypedArray|DataView} The value which will be passed
+    as stdin to the spawned process. Supplying this value will override
+    `stdio[0]`.
   * `stdio` {string|Array} Child's stdio configuration. `stderr` by default will
     be output to the parent process' stderr unless `stdio` is specified.
     **Default:** `'pipe'`.
@@ -753,6 +758,10 @@ arbitrary command execution.**
 <!-- YAML
 added: v0.11.12
 changes:
+  - version: REPLACEME
+    pr-url: REPLACEME
+    description: The `input` option can now be any `TypedArray` or a
+                 `DataView`.
   - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/21316
     description: The `windowsHide` option now defaults to `true`.
@@ -767,8 +776,9 @@ changes:
 * `command` {string} The command to run.
 * `options` {Object}
   * `cwd` {string} Current working directory of the child process.
-  * `input` {string|Buffer|Uint8Array} The value which will be passed as stdin
-    to the spawned process. Supplying this value will override `stdio[0]`.
+  * `input` {string|Buffer|TypedArray|DataView} The value which will be passed
+    as stdin to the spawned process. Supplying this value will override
+    `stdio[0]`.
   * `stdio` {string|Array} Child's stdio configuration. `stderr` by default will
     be output to the parent process' stderr unless `stdio` is specified.
     **Default:** `'pipe'`.
@@ -810,6 +820,10 @@ metacharacters may be used to trigger arbitrary command execution.**
 <!-- YAML
 added: v0.11.12
 changes:
+  - version: REPLACEME
+    pr-url: REPLACEME
+    description: The `input` option can now be any `TypedArray` or a
+                 `DataView`.
   - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/21316
     description: The `windowsHide` option now defaults to `true`.
@@ -831,8 +845,9 @@ changes:
 * `args` {string[]} List of string arguments.
 * `options` {Object}
   * `cwd` {string} Current working directory of the child process.
-  * `input` {string|Buffer|Uint8Array} The value which will be passed as stdin
-    to the spawned process. Supplying this value will override `stdio[0]`.
+  * `input` {string|Buffer|TypedArray|DataView} The value which will be passed
+    as stdin to the spawned process. Supplying this value will override
+    `stdio[0]`.
   * `argv0` {string} Explicitly set the value of `argv[0]` sent to the child
     process. This will be set to `command` if not specified.
   * `stdio` {string|Array} Child's stdio configuration.
diff --git a/doc/api/errors.md b/doc/api/errors.md
index e4a709d45a8031..ff34d3d2de8104 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -1241,8 +1241,8 @@ For example when a function is expected to return a promise.
 <a id="ERR_INVALID_SYNC_FORK_INPUT"></a>
 ### ERR_INVALID_SYNC_FORK_INPUT
 
-A `Buffer`, `Uint8Array` or `string` was provided as stdio input to a
-synchronous fork. See the documentation for the [`child_process`][] module
+A `Buffer`, `TypedArray`, `DataView` or `string` was provided as stdio input to
+an asynchronous fork. See the documentation for the [`child_process`][] module
 for more information.
 
 <a id="ERR_INVALID_THIS"></a>
diff --git a/lib/child_process.js b/lib/child_process.js
index 6cce1b09e5654b..1ab4150b01e659 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -25,7 +25,7 @@ const util = require('util');
 const {
   deprecate, convertToValidSignal, getSystemErrorName
 } = require('internal/util');
-const { isUint8Array } = require('internal/util/types');
+const { isArrayBufferView } = require('internal/util/types');
 const debug = util.debuglog('child_process');
 const { Buffer } = require('buffer');
 const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
@@ -572,13 +572,16 @@ function spawnSync(/* file, args, options */) {
     var input = options.stdio[i] && options.stdio[i].input;
     if (input != null) {
       var pipe = options.stdio[i] = util._extend({}, options.stdio[i]);
-      if (isUint8Array(input)) {
+      if (isArrayBufferView(input)) {
         pipe.input = input;
       } else if (typeof input === 'string') {
         pipe.input = Buffer.from(input, options.encoding);
       } else {
         throw new ERR_INVALID_ARG_TYPE(`options.stdio[${i}]`,
-                                       ['Buffer', 'Uint8Array', 'string'],
+                                       ['Buffer',
+                                        'TypedArray',
+                                        'DataView',
+                                        'string'],
                                        input);
       }
     }
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index cf7e23bf7a9248..c3c4f3387410d7 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -32,7 +32,7 @@ const { UDP } = process.binding('udp_wrap');
 const SocketList = require('internal/socket_list');
 const { owner_symbol } = require('internal/async_hooks').symbols;
 const { convertToValidSignal } = require('internal/util');
-const { isUint8Array } = require('internal/util/types');
+const { isArrayBufferView } = require('internal/util/types');
 const spawn_sync = process.binding('spawn_sync');
 const { HTTPParser } = internalBinding('http_parser');
 const { freeParser } = require('_http_common');
@@ -928,7 +928,7 @@ function _validateStdio(stdio, sync) {
         wrapType: getHandleWrapType(handle),
         handle: handle
       });
-    } else if (isUint8Array(stdio) || typeof stdio === 'string') {
+    } else if (isArrayBufferView(stdio) || typeof stdio === 'string') {
       if (!sync) {
         cleanup();
         throw new ERR_INVALID_SYNC_FORK_INPUT(util.inspect(stdio));
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index 89b51a4cecc9d8..79420a49b72933 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -710,7 +710,8 @@ E('ERR_INVALID_RETURN_VALUE', (input, name, value) => {
          ` function but got ${type}.`;
 }, TypeError);
 E('ERR_INVALID_SYNC_FORK_INPUT',
-  'Asynchronous forks do not support Buffer, Uint8Array or string input: %s',
+  'Asynchronous forks do not support ' +
+    'Buffer, TypedArray, DataView or string input: %s',
   TypeError);
 E('ERR_INVALID_THIS', 'Value of "this" must be of type %s', TypeError);
 E('ERR_INVALID_TUPLE', '%s must be an iterable %s tuple', TypeError);
diff --git a/test/parallel/test-child-process-spawnsync-input.js b/test/parallel/test-child-process-spawnsync-input.js
index 3ea4eae2c449e3..6e4a22c0e32d97 100644
--- a/test/parallel/test-child-process-spawnsync-input.js
+++ b/test/parallel/test-child-process-spawnsync-input.js
@@ -100,16 +100,21 @@ checkSpawnSyncRet(ret);
 assert.deepStrictEqual(ret.stdout, options.input);
 assert.deepStrictEqual(ret.stderr, Buffer.from(''));
 
-options = {
-  input: Uint8Array.from(Buffer.from('hello world'))
-};
+// common.getArrayBufferViews expects a buffer
+// with length an multiple of 8
+const msgBuf = Buffer.from('hello world'.repeat(8));
+for (const arrayBufferView of common.getArrayBufferViews(msgBuf)) {
+  options = {
+    input: arrayBufferView
+  };
 
-ret = spawnSync('cat', [], options);
+  ret = spawnSync('cat', [], options);
 
-checkSpawnSyncRet(ret);
-// Wrap options.input because Uint8Array and Buffer have different prototypes.
-assert.deepStrictEqual(ret.stdout, Buffer.from(options.input));
-assert.deepStrictEqual(ret.stderr, Buffer.from(''));
+  checkSpawnSyncRet(ret);
+
+  assert.deepStrictEqual(ret.stdout, msgBuf);
+  assert.deepStrictEqual(ret.stderr, Buffer.from(''));
+}
 
 verifyBufOutput(spawnSync(process.execPath, args));
 

From 5126cfa37e6a847c41d1696df83af250c50a0af0 Mon Sep 17 00:00:00 2001
From: Sarat Addepalli <sarat.addepalli@paytm.com>
Date: Mon, 20 Aug 2018 16:30:16 +0530
Subject: [PATCH 2/2] doc: update pr-urls in child_process.md

---
 doc/api/child_process.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/api/child_process.md b/doc/api/child_process.md
index 90fa81313d4218..e15829ce3ffccf 100644
--- a/doc/api/child_process.md
+++ b/doc/api/child_process.md
@@ -689,7 +689,7 @@ configuration at startup.
 added: v0.11.12
 changes:
   - version: REPLACEME
-    pr-url: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/22409
     description: The `input` option can now be any `TypedArray` or a
                  `DataView`.
   - version: REPLACEME
@@ -759,7 +759,7 @@ arbitrary command execution.**
 added: v0.11.12
 changes:
   - version: REPLACEME
-    pr-url: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/22409
     description: The `input` option can now be any `TypedArray` or a
                  `DataView`.
   - version: REPLACEME
@@ -821,7 +821,7 @@ metacharacters may be used to trigger arbitrary command execution.**
 added: v0.11.12
 changes:
   - version: REPLACEME
-    pr-url: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/22409
     description: The `input` option can now be any `TypedArray` or a
                  `DataView`.
   - version: REPLACEME