Skip to content

[v9.x] backport 17338, 18186, 18358, 18546 #18916

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
joyeecheung wants to merge 5 commits into from
Closed

[v9.x] backport 17338, 18186, 18358, 18546 #18916

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
017013a
src: expose uv.errmap to binding
joyeecheung Dec 25, 2017
3b18dae
util: implement util.getSystemErrorName()
joyeecheung Jan 16, 2018
a2a2f06
errors: improve the description of ERR_INVALID_ARG_VALUE
joyeecheung Jan 24, 2018
8006e0b
util: skip type checks in internal getSystemErrorName
joyeecheung Feb 3, 2018
714c529
errors: move error creation helpers to errors.js
joyeecheung Feb 3, 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
Prev Previous commit
Next Next commit
util: skip type checks in internal getSystemErrorName 
PR-URL: #18546
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@joyeecheung
joyeecheung committed Feb 22, 2018
commit 8006e0b88d651503d4559cac83fa79ebe4e87d06
5 changes: 0 additions & 5 deletions lib/internal/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,6 @@ function getConstructorOf(obj) {
}

function getSystemErrorName(err) {
if (typeof err !== 'number' || err >= 0 || !Number.isSafeInteger(err)) {
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'err',
'negative number');
}

const entry = errmap.get(err);
return entry ? entry[0] : `Unknown system error ${err}`;
}
Expand Down
10 changes: 9 additions & 1 deletion lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const {
customInspectSymbol,
deprecate,
getConstructorOf,
getSystemErrorName,
getSystemErrorName: internalErrorName,
isError,
promisify,
join,
Expand Down Expand Up @@ -1071,6 +1071,14 @@ function callbackify(original) {
return callbackified;
}

function getSystemErrorName(err) {
if (typeof err !== 'number' || err >= 0 || !Number.isSafeInteger(err)) {
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'err',
'negative number');
}
return internalErrorName(err);
}

// Keep the `exports =` so that various functions can still be monkeypatched
module.exports = exports = {
_errnoException,
Expand Down