fs: don't limit ftruncate() length to 32 bits

The length used by ftruncate() is 64 bits in the binding layer. This commit removes the 32 bit restriction in the JS layer. Backport-PR-URL: #21171 PR-URL: #20851 Fixes: #20844 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Backport-PR-URL: #21171 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
nodejs · May 20, 2018 · fc0b3610e22c0d6056efd3089b3fe710be54463a · fc0b361
1 parent 469baa0
commit fc0b3610e22c0d6056efd3089b3fe710be54463a
Unified Split

Showing with 5 additions and 13 deletions.

+2 −7 lib/fs.js

+2 −2 lib/internal/fs/promises.js

+1 −4 test/parallel/test-fs-truncate.js
diff --git a/lib/fs.js b/lib/fs.js
@@ -86,7 +86,6 @@ const {
 const {
  isUint32,
  validateInteger,
-  
-  validateInt32,
  validateUint32
 } = require('internal/validators');
@@ -788,11 +787,7 @@ fs.ftruncate = function(fd, len = 0, callback) {
    len = 0;
  }
  validateUint32(fd, 'fd');
-  
-  // TODO(BridgeAR): This does not seem right.
-  
-  // There does not seem to be any validation before and if there is any, it
-  
-  // should work similar to validateUint32 or not have a upper cap at all.
-  
-  // This applies to all usage of `validateInt32(len, 'len')`.
-  
-  validateInt32(len, 'len');
+  
+  validateInteger(len, 'len');
  len = Math.max(0, len);
  const req = new FSReqWrap();
  req.oncomplete = makeCallback(callback);
@@ -801,7 +796,7 @@ fs.ftruncate = function(fd, len = 0, callback) {
 fs.ftruncateSync = function(fd, len = 0) {
  validateUint32(fd, 'fd');
-  
-  validateInt32(len, 'len');
+  
+  validateInteger(len, 'len');
  len = Math.max(0, len);
  const ctx = {};
  binding.ftruncate(fd, len, undefined, ctx);

diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
@@ -33,7 +33,7 @@ const {
  validatePath
 } = require('internal/fs/utils');
 const {
-  
-  validateInt32,
+  
+  validateInteger,
  validateUint32
 } = require('internal/validators');
 const pathModule = require('path');
@@ -264,7 +264,7 @@ async function truncate(path, len = 0) {
 async function ftruncate(handle, len = 0) {
  validateFileHandle(handle);
-  
-  validateInt32(len, 'len');
+  
+  validateInteger(len, 'len');
  len = Math.max(0, len);
  return binding.ftruncate(handle.fd, len, kUsePromises);
 }

diff --git a/test/parallel/test-fs-truncate.js b/test/parallel/test-fs-truncate.js
@@ -220,17 +220,14 @@ function testFtruncate(cb) {
                  `an integer. Received ${input}`
      }
    );
-  
-  });
-  
-  // 2 ** 31 = 2147483648
-  
-  [2147483648, -2147483649].forEach((input) => {
    assert.throws(
      () => fs.ftruncate(fd, input),
      {
        code: 'ERR_OUT_OF_RANGE',
        name: 'RangeError [ERR_OUT_OF_RANGE]',
        message: 'The value of "len" is out of range. It must be ' +
-  
-                  `> -2147483649 && < 2147483648. Received ${input}`
+  
+                  `an integer. Received ${input}`
      }
    );
  });