fs: replace checkPosition with validateInteger

PR-URL: #33277 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yongsheng Zhang <[email protected]>
nodejs · Jul 8, 2020 · 5fb1cc8 · 5fb1cc8
1 parent 0837c2c
commit 5fb1cc8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/lib/internal/fs/streams.js b/lib/internal/fs/streams.js
@@ -3,8 +3,6 @@
 const {
   Array,
   MathMin,
-  NumberIsInteger,
-  NumberIsSafeInteger,
   ObjectDefineProperty,
   ObjectSetPrototypeOf,
   Symbol,
@@ -15,7 +13,7 @@ const {
   ERR_OUT_OF_RANGE,
   ERR_STREAM_DESTROYED
 } = require('internal/errors').codes;
-const { validateNumber } = require('internal/validators');
+const { validateInteger } = require('internal/validators');
 const fs = require('fs');
 const { Buffer } = require('buffer');
 const {
@@ -46,19 +44,6 @@ function allocNewPool(poolSize) {
   pool.used = 0;
 }
 
-// Check the `this.start` and `this.end` of stream.
-function checkPosition(pos, name) {
-  if (!NumberIsSafeInteger(pos)) {
-    validateNumber(pos, name);
-    if (!NumberIsInteger(pos))
-      throw new ERR_OUT_OF_RANGE(name, 'an integer', pos);
-    throw new ERR_OUT_OF_RANGE(name, '>= 0 and <= 2 ** 53 - 1', pos);
-  }
-  if (pos < 0) {
-    throw new ERR_OUT_OF_RANGE(name, '>= 0 and <= 2 ** 53 - 1', pos);
-  }
-}
-
 function roundUpToMultipleOf8(n) {
   return (n + 7) & ~7;  // Align to 8 byte boundary.
 }
@@ -111,15 +96,15 @@ function ReadStream(path, options) {
   this[kIsPerformingIO] = false;
 
   if (this.start !== undefined) {
-    checkPosition(this.start, 'start');
+    validateInteger(this.start, 'start', 0);
 
     this.pos = this.start;
   }
 
   if (this.end === undefined) {
     this.end = Infinity;
   } else if (this.end !== Infinity) {
-    checkPosition(this.end, 'end');
+    validateInteger(this.end, 'end', 0);
 
     if (this.start !== undefined && this.start > this.end) {
       throw new ERR_OUT_OF_RANGE(
@@ -339,7 +324,7 @@ function WriteStream(path, options) {
   this[kIsPerformingIO] = false;
 
   if (this.start !== undefined) {
-    checkPosition(this.start, 'start');
+    validateInteger(this.start, 'start', 0);
 
     this.pos = this.start;
   }

diff --git a/test/parallel/test-file-write-stream3.js b/test/parallel/test-file-write-stream3.js
@@ -182,10 +182,12 @@ const run_test_4 = common.mustCall(function() {
   const fn = () => {
     fs.createWriteStream(filepath, { start: -5, flags: 'r+' });
   };
+  // Verify the range of values using a common integer verifier.
+  // Limit Number.MAX_SAFE_INTEGER
   const err = {
     code: 'ERR_OUT_OF_RANGE',
     message: 'The value of "start" is out of range. ' +
-             'It must be >= 0 and <= 2 ** 53 - 1. Received -5',
+             `It must be >= 0 && <= ${Number.MAX_SAFE_INTEGER}. Received -5`,
     name: 'RangeError'
   };
   assert.throws(fn, err);
@@ -197,10 +199,13 @@ const run_test_5 = common.mustCall(function() {
   const fn = () => {
     fs.createWriteStream(filepath, { start: 2 ** 53, flags: 'r+' });
   };
+  // Verify the range of values using a common integer verifier.
+  // Limit Number.MAX_SAFE_INTEGER
   const err = {
     code: 'ERR_OUT_OF_RANGE',
     message: 'The value of "start" is out of range. It must be ' +
-             '>= 0 and <= 2 ** 53 - 1. Received 9_007_199_254_740_992',
+             `>= 0 && <= ${Number.MAX_SAFE_INTEGER}. ` +
+             'Received 9_007_199_254_740_992',
     name: 'RangeError'
   };
   assert.throws(fn, err);