Skip to content

util: improve internal isError() validation #24746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BridgeAR wants to merge 5 commits into from
Closed

util: improve internal isError() validation #24746

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab135e7
util: improve internal `isError()` validation
BridgeAR Nov 18, 2018
9009e4c
fixup: add test case
BridgeAR Nov 30, 2018
434eb41
fixup: add further test case
BridgeAR Dec 2, 2018
d346011
fixup: more verbose comment
BridgeAR Dec 2, 2018
ddc82e4
fixup: add test explanation
BridgeAR Dec 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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.
  • Loading branch information
@BridgeAR
BridgeAR committed Nov 30, 2018
commit ab135e7bc826d213b88273fb5b2d2e0fbaf3f159
6 changes: 5 additions & 1 deletion lib/internal/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ const {
arrow_message_private_symbol: kArrowMessagePrivateSymbolIndex,
decorated_private_symbol: kDecoratedPrivateSymbolIndex
} = internalBinding('util');
const {
isNativeError
} = internalBinding('types');

const { errmap } = internalBinding('uv');

Expand All @@ -26,7 +29,8 @@ 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.
return isNativeError(e) || e instanceof Error;
}

function objectToString(o) {
Expand Down
12 changes: 10 additions & 2 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -434,7 +440,9 @@ module.exports = exports = {
isRegExp,
isObject,
isDate,
isError,
isError(e) {
return objectToString(e) === '[object Error]' || e instanceof Error;
},
isFunction,
isPrimitive,
log,
Expand Down