Skip to content
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

Jump to bottom

lib: created isValidCallback validator #32665

Closed
wants to merge 1 commit into from
Closed

lib: created isValidCallback validator #32665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion lib/internal/validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ const {
ERR_INVALID_ARG_TYPE,
ERR_INVALID_ARG_VALUE,
ERR_OUT_OF_RANGE,
ERR_UNKNOWN_SIGNAL
ERR_UNKNOWN_SIGNAL,
ERR_INVALID_CALLBACK,
}
} = require('internal/errors');
const { normalizeEncoding } = require('internal/util');
Expand Down Expand Up @@ -194,6 +195,11 @@ function validatePort(port, name = 'Port', { allowZero = true } = {}) {
return port | 0;
}

const validateCallback = hideStackFrames((callback) => {
if (typeof callback !== 'function')
throw new ERR_INVALID_CALLBACK(callback);
});

module.exports = {
isInt32,
isUint32,
Expand All @@ -210,4 +216,5 @@ module.exports = {
validateSignalName,
validateString,
validateUint32,
validateCallback,
};
14 changes: 4 additions & 10 deletions lib/timers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ const {
promisify: { custom: customPromisify },
deprecate
} = require('internal/util');
const { ERR_INVALID_CALLBACK } = require('internal/errors').codes;
const debug = require('internal/util/debuglog').debuglog('timer');
const { validateCallback } = require('internal/validators');

const {
destroyHooksExist,
Expand Down Expand Up @@ -118,9 +118,7 @@ function enroll(item, msecs) {


function setTimeout(callback, after, arg1, arg2, arg3) {
if (typeof callback !== 'function') {
throw new ERR_INVALID_CALLBACK(callback);
}
validateCallback(callback);

let i, args;
switch (arguments.length) {
Expand Down Expand Up @@ -165,9 +163,7 @@ function clearTimeout(timer) {
}

function setInterval(callback, repeat, arg1, arg2, arg3) {
if (typeof callback !== 'function') {
throw new ERR_INVALID_CALLBACK(callback);
}
validateCallback(callback);

let i, args;
switch (arguments.length) {
Expand Down Expand Up @@ -249,9 +245,7 @@ const Immediate = class Immediate {
};

function setImmediate(callback, arg1, arg2, arg3) {
if (typeof callback !== 'function') {
throw new ERR_INVALID_CALLBACK(callback);
}
validateCallback(callback);

let i, args;
switch (arguments.length) {
Expand Down