From a0f728434617c1b84e20a56da33ed888dc254508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Sat, 17 Jun 2017 13:50:25 +0200
Subject: [PATCH] errors,process: fix error message of hrtime()

process.hrtime() incorrectly passed the function name to
errors.TypeError instead of the name of the argument.
Additionally, the type of the actual argument was added to the error
message and a new error code ERR_INVALID_ARRAY_LENGTH was added.

PR-URL: https://github.com/nodejs/node/pull/13739
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/internal/errors.js               |  9 +++++++++
 lib/internal/process.js              | 19 +++++++++++-------
 test/parallel/test-process-hrtime.js | 30 ++++++++++++++++++----------
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index a73d4599313..dd30097c43c 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -122,6 +122,15 @@ E('ERR_HTTP_INVALID_CHAR', 'Invalid character in statusMessage.');
 E('ERR_HTTP_INVALID_STATUS_CODE',
   (originalStatusCode) => `Invalid status code: ${originalStatusCode}`);
 E('ERR_INDEX_OUT_OF_RANGE', 'Index out of range');
+E('ERR_INVALID_ARRAY_LENGTH',
+  (name, length, actual) => {
+    let msg = `The "${name}" array must have a length of ${length}`;
+    if (arguments.length > 2) {
+      const len = Array.isArray(actual) ? actual.length : actual;
+      msg += `. Received length ${len}`;
+    }
+    return msg;
+  });
 E('ERR_INVALID_ARG_TYPE', invalidArgType);
 E('ERR_INVALID_CALLBACK', 'callback must be a function');
 E('ERR_INVALID_FD', (fd) => `"fd" must be a positive integer: ${fd}`);
diff --git a/lib/internal/process.js b/lib/internal/process.js
index aa5655d0ef9..5254b5993bd 100644
--- a/lib/internal/process.js
+++ b/lib/internal/process.js
@@ -78,14 +78,19 @@ function setup_hrtime() {
     _hrtime(hrValues);
 
     if (time !== undefined) {
-      if (Array.isArray(time) && time.length === 2) {
-        const sec = (hrValues[0] * 0x100000000 + hrValues[1]) - time[0];
-        const nsec = hrValues[2] - time[1];
-        const needsBorrow = nsec < 0;
-        return [needsBorrow ? sec - 1 : sec, needsBorrow ? nsec + 1e9 : nsec];
+      if (!Array.isArray(time)) {
+        throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'time', 'Array',
+                                   time);
       }
-      throw new errors.TypeError('ERR_INVALID_ARG_TYPE',
-                                 'process.hrtime()', 'Array');
+      if (time.length !== 2) {
+        throw new errors.TypeError('ERR_INVALID_ARRAY_LENGTH', 'time', 2,
+                                   time);
+      }
+
+      const sec = (hrValues[0] * 0x100000000 + hrValues[1]) - time[0];
+      const nsec = hrValues[2] - time[1];
+      const needsBorrow = nsec < 0;
+      return [needsBorrow ? sec - 1 : sec, needsBorrow ? nsec + 1e9 : nsec];
     }
 
     return [
diff --git a/test/parallel/test-process-hrtime.js b/test/parallel/test-process-hrtime.js
index 77e19533a8b..faf05fef112 100644
--- a/test/parallel/test-process-hrtime.js
+++ b/test/parallel/test-process-hrtime.js
@@ -32,25 +32,35 @@ validateTuple(tuple);
 // validate that passing an existing tuple returns another valid tuple
 validateTuple(process.hrtime(tuple));
 
-const invalidHrtimeArgument = common.expectsError({
-  code: 'ERR_INVALID_ARG_TYPE',
-  type: TypeError,
-  message: 'The "process.hrtime()" argument must be of type Array'
-});
-
 // test that only an Array may be passed to process.hrtime()
 assert.throws(() => {
   process.hrtime(1);
-}, invalidHrtimeArgument);
+}, common.expectsError({
+  code: 'ERR_INVALID_ARG_TYPE',
+  type: TypeError,
+  message: 'The "time" argument must be of type Array. Received type number'
+}));
 assert.throws(() => {
   process.hrtime([]);
-}, invalidHrtimeArgument);
+}, common.expectsError({
+  code: 'ERR_INVALID_ARRAY_LENGTH',
+  type: TypeError,
+  message: 'The "time" array must have a length of 2. Received length 0'
+}));
 assert.throws(() => {
   process.hrtime([1]);
-}, invalidHrtimeArgument);
+}, common.expectsError({
+  code: 'ERR_INVALID_ARRAY_LENGTH',
+  type: TypeError,
+  message: 'The "time" array must have a length of 2. Received length 1'
+}));
 assert.throws(() => {
   process.hrtime([1, 2, 3]);
-}, invalidHrtimeArgument);
+}, common.expectsError({
+  code: 'ERR_INVALID_ARRAY_LENGTH',
+  type: TypeError,
+  message: 'The "time" array must have a length of 2. Received length 3'
+}));
 
 function validateTuple(tuple) {
   assert(Array.isArray(tuple));