From 91a4cb71753b7c7012022e3e67c7a1f16f3b5e80 Mon Sep 17 00:00:00 2001 From: Zach Bjornson Date: Tue, 12 Mar 2019 00:14:19 -0700 Subject: [PATCH] lib: rename validateInteger to validateSafeInteger PR-URL: https://github.com/nodejs/node/pull/26572 Reviewed-By: Anna Henningsen Reviewed-By: Ruben Bridgewater Reviewed-By: Ujjwal Sharma Reviewed-By: James M Snell Reviewed-By: Rich Trott --- lib/fs.js | 8 ++++---- lib/internal/crypto/scrypt.js | 4 ++-- lib/internal/fs/promises.js | 4 ++-- lib/internal/validators.js | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/fs.js b/lib/fs.js index 2ca3bdf21acab2..0aa03ffe229140 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -85,7 +85,7 @@ const { isUint32, parseMode, validateBuffer, - validateInteger, + validateSafeInteger, validateInt32, validateUint32 } = require('internal/validators'); @@ -621,7 +621,7 @@ function truncate(path, len, callback) { len = 0; } - validateInteger(len, 'len'); + validateSafeInteger(len, 'len'); callback = maybeCallback(callback); fs.open(path, 'r+', (er, fd) => { if (er) return callback(er); @@ -662,7 +662,7 @@ function ftruncate(fd, len = 0, callback) { len = 0; } validateInt32(fd, 'fd', 0); - validateInteger(len, 'len'); + validateSafeInteger(len, 'len'); len = Math.max(0, len); const req = new FSReqCallback(); req.oncomplete = makeCallback(callback); @@ -671,7 +671,7 @@ function ftruncate(fd, len = 0, callback) { function ftruncateSync(fd, len = 0) { validateInt32(fd, 'fd', 0); - validateInteger(len, 'len'); + validateSafeInteger(len, 'len'); len = Math.max(0, len); const ctx = {}; binding.ftruncate(fd, len, undefined, ctx); diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js index e2751f8fa58261..19a742c85c7b91 100644 --- a/lib/internal/crypto/scrypt.js +++ b/lib/internal/crypto/scrypt.js @@ -3,7 +3,7 @@ const { AsyncWrap, Providers } = internalBinding('async_wrap'); const { Buffer } = require('buffer'); const { scrypt: _scrypt } = internalBinding('crypto'); -const { validateInteger, validateUint32 } = require('internal/validators'); +const { validateSafeInteger, validateUint32 } = require('internal/validators'); const { ERR_CRYPTO_SCRYPT_INVALID_PARAMETER, ERR_CRYPTO_SCRYPT_NOT_SUPPORTED, @@ -108,7 +108,7 @@ function check(password, salt, keylen, options) { } if (options.maxmem !== undefined) { maxmem = options.maxmem; - validateInteger(maxmem, 'maxmem', 0); + validateSafeInteger(maxmem, 'maxmem', 0); } if (N === 0) N = defaults.N; if (r === 0) r = defaults.r; diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js index d807cb71f7127f..c8203055b57cfe 100644 --- a/lib/internal/fs/promises.js +++ b/lib/internal/fs/promises.js @@ -36,7 +36,7 @@ const { const { parseMode, validateBuffer, - validateInteger, + validateSafeInteger, validateUint32 } = require('internal/validators'); const pathModule = require('path'); @@ -270,7 +270,7 @@ async function truncate(path, len = 0) { async function ftruncate(handle, len = 0) { validateFileHandle(handle); - validateInteger(len, 'len'); + validateSafeInteger(len, 'len'); len = Math.max(0, len); return binding.ftruncate(handle.fd, len, kUsePromises); } diff --git a/lib/internal/validators.js b/lib/internal/validators.js index f74338ebcb8cef..88d1d0a42cf444 100644 --- a/lib/internal/validators.js +++ b/lib/internal/validators.js @@ -62,7 +62,7 @@ function parseMode(value, name, def) { throw new ERR_INVALID_ARG_VALUE(name, value, modeDesc); } -const validateInteger = hideStackFrames( +const validateSafeInteger = hideStackFrames( (value, name, min = MIN_SAFE_INTEGER, max = MAX_SAFE_INTEGER) => { if (typeof value !== 'number') throw new ERR_INVALID_ARG_TYPE(name, 'number', value); @@ -161,7 +161,7 @@ module.exports = { parseMode, validateBuffer, validateEncoding, - validateInteger, + validateSafeInteger, validateInt32, validateUint32, validateString,