process: fix error handling

This makes sure the proper error is returned. Right now the error
is not specific enough.

PR-URL: https://github.com/nodejs/node/pull/19445
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>

1 files changed, 16 insertions, 2 deletions

diff --git a/lib/internal/process.js b/lib/internal/process.js
index 375fb314cb..b735ba2e4b 100644
--- a/lib/internal/process.js
+++ b/lib/internal/process.js
@@ -7,6 +7,7 @@ const {
     ERR_CPU_USAGE,
     ERR_INVALID_ARG_TYPE,
     ERR_INVALID_ARRAY_LENGTH,
+    ERR_INVALID_OPT_VALUE,
     ERR_UNCAUGHT_EXCEPTION_CAPTURE_ALREADY_SET,
     ERR_UNKNOWN_SIGNAL
   }
@@ -41,11 +42,24 @@ function setup_cpuUsage() {
     // If a previous value was passed in, ensure it has the correct shape.
     if (prevValue) {
       if (!previousValueIsValid(prevValue.user)) {
-        throw new ERR_INVALID_ARG_TYPE('preValue.user', 'number');
+        if (typeof prevValue !== 'object')
+          throw new ERR_INVALID_ARG_TYPE('prevValue', 'object', prevValue);
+
+        if (typeof prevValue.user !== 'number') {
+          throw new ERR_INVALID_ARG_TYPE('prevValue.user',
+                                         'number', prevValue.user);
+        }
+        throw new ERR_INVALID_OPT_VALUE.RangeError('prevValue.user',
+                                                   prevValue.user);
       }
 
       if (!previousValueIsValid(prevValue.system)) {
-        throw new ERR_INVALID_ARG_TYPE('preValue.system', 'number');
+        if (typeof prevValue.system !== 'number') {
+          throw new ERR_INVALID_ARG_TYPE('prevValue.system',
+                                         'number', prevValue.system);
+        }
+        throw new ERR_INVALID_OPT_VALUE.RangeError('prevValue.system',
+                                                   prevValue.system);
       }
     }