aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRuben Bridgewater <ruben@bridgewater.de>2017-12-09 14:13:34 -0200
committerRuben Bridgewater <ruben@bridgewater.de>2018-03-07 00:21:37 +0100
commitb5825e125cf9a6c71c354eb006188c432414ee65 (patch)
treefc7efa54e338e7a21e72a6408bd380d3d19b49f9 /lib
parent4e15679c026d2969efa276149282df388e0533b3 (diff)
downloadandroid-node-v8-b5825e125cf9a6c71c354eb006188c432414ee65.tar.gz
android-node-v8-b5825e125cf9a6c71c354eb006188c432414ee65.tar.bz2
android-node-v8-b5825e125cf9a6c71c354eb006188c432414ee65.zip
assert: improve error check
Minor performance improvement. PR-URL: https://github.com/nodejs/node/pull/17574 Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/internal/errors.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index 11f32ccdc1..0fdf795433 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -342,11 +342,14 @@ class AssertionError extends Error {
red = '\u001b[31m';
}
const util = lazyUtil();
-
- if (actual && actual.stack && actual instanceof Error)
+ if (typeof actual === 'object' && actual !== null &&
+ 'stack' in actual && actual instanceof Error) {
actual = `${actual.name}: ${actual.message}`;
- if (expected && expected.stack && expected instanceof Error)
+ }
+ if (typeof expected === 'object' && expected !== null &&
+ 'stack' in expected && expected instanceof Error) {
expected = `${expected.name}: ${expected.message}`;
+ }
if (errorDiff === 0) {
let res = util.inspect(actual);