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

util: use missing validators #38893

Closed
wants to merge 4 commits into from
Closed

util: use missing validators #38893

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dda5e5f
util: use missing validators
VoltrexKeyva Jun 1, 2021
5ed5519
fixup! remove unused error constructor
VoltrexKeyva Jun 1, 2021
43c4491
fixup! pass valid test value
VoltrexKeyva Jun 1, 2021
80b1d81
fixup! prototype test value
VoltrexKeyva Jun 1, 2021
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
15 changes: 4 additions & 11 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ const {
const {
codes: {
ERR_FALSY_VALUE_REJECTION,
ERR_INVALID_ARG_TYPE,
ERR_OUT_OF_RANGE
},
errnoException,
Expand All @@ -63,6 +62,7 @@ const { debuglog } = require('internal/util/debuglog');
const {
validateFunction,
validateNumber,
validateObject,
} = require('internal/validators');
const { TextDecoder, TextEncoder } = require('internal/encoding');
const { isBuffer } = require('buffer').Buffer;
Expand Down Expand Up @@ -229,17 +229,10 @@ function log(...args) {
* the super constructor lacks a prototype.
*/
function inherits(ctor, superCtor) {
validateFunction(ctor, 'ctor');
validateFunction(superCtor, 'superCtor');
validateObject(superCtor.prototype, 'superCtor.prototype');

if (ctor === undefined || ctor === null)
throw new ERR_INVALID_ARG_TYPE('ctor', 'Function', ctor);

if (superCtor === undefined || superCtor === null)
throw new ERR_INVALID_ARG_TYPE('superCtor', 'Function', superCtor);

if (superCtor.prototype === undefined) {
throw new ERR_INVALID_ARG_TYPE('superCtor.prototype',
'Object', superCtor.prototype);
}
ObjectDefineProperty(ctor, 'super_', {
value: superCtor,
writable: true,
Expand Down