Skip to content

[v10.x] Backport pending pull requests #21172

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
targos wants to merge 14 commits into from
Closed

[v10.x] Backport pending pull requests #21172

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0577312
fs: don't limit ftruncate() length to 32 bits
cjihrig May 20, 2018
39df351
process: backport process/methods file
targos Jun 6, 2018
748ca53
lib: mask mode_t type of arguments with 0o777
joyeecheung May 9, 2018
57a11af
doc: document file mode caveats on Windows
joyeecheung May 9, 2018
f6ab989
fs: drop duplicate API in promises mode
ChALkeR May 6, 2018
436cf2d
lib: support ranges in validateInt32()
cjihrig May 20, 2018
c6e9e54
fs: improve fchmod{Sync} validation
cjihrig May 20, 2018
b50c42e
fs: refactor fs module
jasnell May 15, 2018
f4287e6
test: increase coverage for fs.promises.truncate
May 9, 2018
c13cd35
src: refactor bootstrap to use bootstrap object
jasnell May 23, 2018
1bdc06b
doc: fix inconsistent documentation (host vs hostname)
davisokoth May 24, 2018
633b24d
lib: unmask mode_t values with 0o777
joyeecheung May 26, 2018
d2ad241
fs: do not crash when using a closed fs event watcher
joyeecheung May 26, 2018
a20498a
async_hooks: remove deprecated example
mafintosh May 28, 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
lib: support ranges in validateInt32() 
This commit adds minimum and maximum value checks to the
validateInt32() validator.

PR-URL: #20588
Fixes: #20498
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
@cjihrig @targos
cjihrig authored and targos committed Jun 6, 2018
commit 436cf2d30d8c1a0832f38841e73cb3ab24d06f98
8 changes: 6 additions & 2 deletions lib/internal/validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,22 @@ function validateInteger(value, name) {
}

function validateInt32(value, name, min = -2147483648, max = 2147483647) {
// The defaults for min and max correspond to the limits of 32-bit integers.
if (!isInt32(value)) {
let err;
if (typeof value !== 'number') {
err = new ERR_INVALID_ARG_TYPE(name, 'number', value);
} else if (!Number.isInteger(value)) {
err = new ERR_OUT_OF_RANGE(name, 'an integer', value);
} else {
// 2 ** 31 === 2147483648
err = new ERR_OUT_OF_RANGE(name, '> -2147483649 && < 2147483648', value);
err = new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
}
Error.captureStackTrace(err, validateInt32);
throw err;
} else if (value < min || value > max) {
const err = new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
Error.captureStackTrace(err, validateInt32);
throw err;
}
}

Expand Down