FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

lib: refactor `validateInt32` and `validateUint32` · nodejs/node@4968ebf · GitHub

/ node Public

Commit 4968ebf

Browse files
mawaregetsuka
authored and
juanarbol
committed
lib: refactor validateInt32 and validateUint32
PR-URL: #43071 Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent f700074 commit 4968ebf

7 files changed

Lines changed: 20 additions & 36 deletions

File tree

‎lib/internal/dns/utils.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ const {
3838

3939
function validateTimeout(options) {
4040
const { timeout = -1 } = { ...options };
41-
validateInt32(timeout, 'options.timeout', -1, 2 ** 31 - 1);
41+
validateInt32(timeout, 'options.timeout', -1);
4242
return timeout;
4343
}
4444

4545
function validateTries(options) {
4646
const { tries = 4 } = { ...options };
47-
validateInt32(tries, 'options.tries', 1, 2 ** 31 - 1);
47+
validateInt32(tries, 'options.tries', 1);
4848
return tries;
4949
}
5050

‎lib/internal/validators.js‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function parseFileMode(value, name, def) {
6767
value = NumberParseInt(value, 8);
6868
}
6969

70-
validateInt32(value, name, 0, 2 ** 32 - 1);
70+
validateUint32(value, name);
7171
return value;
7272
}
7373

@@ -88,11 +88,8 @@ const validateInt32 = hideStackFrames(
8888
if (typeof value !== 'number') {
8989
throw new ERR_INVALID_ARG_TYPE(name, 'number', value);
9090
}
91-
if (!isInt32(value)) {
92-
if (!NumberIsInteger(value)) {
93-
throw new ERR_OUT_OF_RANGE(name, 'an integer', value);
94-
}
95-
throw new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
91+
if (!NumberIsInteger(value)) {
92+
throw new ERR_OUT_OF_RANGE(name, 'an integer', value);
9693
}
9794
if (value < min || value > max) {
9895
throw new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
@@ -104,16 +101,14 @@ const validateUint32 = hideStackFrames((value, name, positive) => {
104101
if (typeof value !== 'number') {
105102
throw new ERR_INVALID_ARG_TYPE(name, 'number', value);
106103
}
107-
if (!isUint32(value)) {
108-
if (!NumberIsInteger(value)) {
109-
throw new ERR_OUT_OF_RANGE(name, 'an integer', value);
110-
}
111-
const min = positive ? 1 : 0;
112-
// 2 ** 32 === 4294967296
113-
throw new ERR_OUT_OF_RANGE(name, `>= ${min} && < 4294967296`, value);
104+
if (!NumberIsInteger(value)) {
105+
throw new ERR_OUT_OF_RANGE(name, 'an integer', value);
114106
}
115-
if (positive && value === 0) {
116-
throw new ERR_OUT_OF_RANGE(name, '>= 1 && < 4294967296', value);
107+
const min = positive ? 1 : 0;
108+
// 2 ** 32 === 4294967296
109+
const max = 4_294_967_295;
110+
if (value < min || value > max) {
111+
throw new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
117112
}
118113
});
119114

‎test/parallel/test-crypto-keygen.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,8 +1131,6 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
11311131
}, common.mustNotCall()), {
11321132
name: 'TypeError',
11331133
code: 'ERR_INVALID_ARG_VALUE',
1134-
message: "The property 'options.modulusLength' is invalid. " +
1135-
`Received ${inspect(modulusLength)}`
11361134
});
11371135
}
11381136

‎test/parallel/test-crypto-pbkdf2.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ for (const iterations of [-1, 0]) {
6969
{
7070
code: 'ERR_OUT_OF_RANGE',
7171
name: 'RangeError',
72-
message: 'The value of "iterations" is out of range. ' +
73-
`It must be >= 1 && < 4294967296. Received ${iterations}`
7472
}
7573
);
7674
}
@@ -108,8 +106,6 @@ for (const iterations of [-1, 0]) {
108106
}, {
109107
code: 'ERR_OUT_OF_RANGE',
110108
name: 'RangeError',
111-
message: 'The value of "keylen" is out of range. It must be >= 0 && < ' +
112-
`4294967296. Received ${input === -1 ? '-1' : '4_294_967_297'}`
113109
});
114110
});
115111

‎test/parallel/test-file-validate-mode-flag.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,28 @@ const {
1313
} = require('fs');
1414

1515
// These should throw, not crash.
16+
const invalid = 4_294_967_296;
1617

17-
assert.throws(() => open(__filename, 2176057344, common.mustNotCall()), {
18+
assert.throws(() => open(__filename, invalid, common.mustNotCall()), {
1819
code: 'ERR_OUT_OF_RANGE'
1920
});
2021

21-
assert.throws(() => open(__filename, 0, 2176057344, common.mustNotCall()), {
22+
assert.throws(() => open(__filename, 0, invalid, common.mustNotCall()), {
2223
code: 'ERR_OUT_OF_RANGE'
2324
});
2425

25-
assert.throws(() => openSync(__filename, 2176057344), {
26+
assert.throws(() => openSync(__filename, invalid), {
2627
code: 'ERR_OUT_OF_RANGE'
2728
});
2829

29-
assert.throws(() => openSync(__filename, 0, 2176057344), {
30+
assert.throws(() => openSync(__filename, 0, invalid), {
3031
code: 'ERR_OUT_OF_RANGE'
3132
});
3233

33-
assert.rejects(openPromise(__filename, 2176057344), {
34+
assert.rejects(openPromise(__filename, invalid), {
3435
code: 'ERR_OUT_OF_RANGE'
3536
});
3637

37-
assert.rejects(openPromise(__filename, 0, 2176057344), {
38+
assert.rejects(openPromise(__filename, 0, invalid), {
3839
code: 'ERR_OUT_OF_RANGE'
3940
});

‎test/parallel/test-process-setgroups.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ assert.throws(
2929
{
3030
code: 'ERR_OUT_OF_RANGE',
3131
name: 'RangeError',
32-
message: 'The value of "groups[1]" is out of range. ' +
33-
'It must be >= 0 && < 4294967296. Received -1'
3432
}
3533
);
3634

‎test/parallel/test-readline-interface.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,7 @@ function assertCursorRowsAndCols(rli, rows, cols) {
131131
input,
132132
tabSize: 0
133133
}),
134-
{
135-
message: 'The value of "tabSize" is out of range. ' +
136-
'It must be >= 1 && < 4294967296. Received 0',
137-
code: 'ERR_OUT_OF_RANGE'
138-
}
134+
{ code: 'ERR_OUT_OF_RANGE' }
139135
);
140136

141137
assert.throws(

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL