util: improve internal `isError()` validation

The current internal isError function checked the toString value
instead of using the more precise `util.types.isNativeError()` check.
The `instanceof` check is not removed due to possible errors that
are not native but still an instance of Error.

PR-URL: https://github.com/nodejs/node/pull/24746
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>

2 files changed, 17 insertions, 3 deletions

diff --git a/lib/internal/util.js b/lib/internal/util.js
index 414d037a29..ee550fad2e 100644
--- a/lib/internal/util.js
+++ b/lib/internal/util.js
@@ -12,6 +12,9 @@ const {
   arrow_message_private_symbol: kArrowMessagePrivateSymbolIndex,
   decorated_private_symbol: kDecoratedPrivateSymbolIndex
 } = internalBinding('util');
+const {
+  isNativeError
+} = internalBinding('types');
 
 const { errmap } = internalBinding('uv');
 
@@ -26,7 +29,10 @@ function removeColors(str) {
 }
 
 function isError(e) {
-  return objectToString(e) === '[object Error]' || e instanceof Error;
+  // An error could be an instance of Error while not being a native error
+  // or could be from a different realm and not be instance of Error but still
+  // be a native error.
+  return isNativeError(e) || e instanceof Error;
 }
 
 function objectToString(o) {
diff --git a/lib/util.js b/lib/util.js
index 63b34f48bf..8f7f3a92dd 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -42,10 +42,16 @@ const {
 const {
   deprecate,
   getSystemErrorName: internalErrorName,
-  isError,
   promisify,
 } = require('internal/util');
 
+const ReflectApply = Reflect.apply;
+
+function uncurryThis(func) {
+  return (thisArg, ...args) => ReflectApply(func, thisArg, args);
+}
+const objectToString = uncurryThis(Object.prototype.toString);
+
 let CIRCULAR_ERROR_MESSAGE;
 let internalDeepEqual;
 
@@ -443,7 +449,9 @@ module.exports = exports = {
   isRegExp,
   isObject,
   isDate,
-  isError,
+  isError(e) {
+    return objectToString(e) === '[object Error]' || e instanceof Error;
+  },
   isFunction,
   isPrimitive,
   log,