fs: update validateOffsetLengthRead in utils.js

PR-URL: #32896 Fixes: #32871 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Zeyu Yang <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]> Reviewed-By: Andrey Pechkurov <[email protected]>
nodejs · Apr 27, 2020 · 4c643c0 · 4c643c0
1 parent 4ef91a6
commit 4c643c0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
@@ -539,13 +539,15 @@ function toUnixTimestamp(time, name = 'time') {
 
 const validateOffsetLengthRead = hideStackFrames(
   (offset, length, bufferLength) => {
-    if (offset < 0 || offset >= bufferLength) {
-      throw new ERR_OUT_OF_RANGE('offset',
-                                 `>= 0 && <= ${bufferLength}`, offset);
+    if (offset < 0) {
+      throw new ERR_OUT_OF_RANGE('offset', '>= 0', offset);
     }
-    if (length < 0 || offset + length > bufferLength) {
+    if (length < 0) {
+      throw new ERR_OUT_OF_RANGE('length', '>= 0', length);
+    }
+    if (offset + length > bufferLength) {
       throw new ERR_OUT_OF_RANGE('length',
-                                 `>= 0 && <= ${bufferLength - offset}`, length);
+                                 `<= ${bufferLength - offset}`, length);
     }
   }
 );

diff --git a/test/parallel/test-fs-read-type.js b/test/parallel/test-fs-read-type.js
@@ -44,7 +44,7 @@ assert.throws(() => {
 }, {
   code: 'ERR_OUT_OF_RANGE',
   name: 'RangeError',
-  message: 'The value of "offset" is out of range. It must be >= 0 && <= 4. ' +
+  message: 'The value of "offset" is out of range. It must be >= 0. ' +
            'Received -1'
 });
 
@@ -73,7 +73,7 @@ assert.throws(() => {
   code: 'ERR_OUT_OF_RANGE',
   name: 'RangeError',
   message: 'The value of "length" is out of range. ' +
-           'It must be >= 0 && <= 4. Received -1'
+           'It must be >= 0. Received -1'
 });
 
 
@@ -110,7 +110,7 @@ assert.throws(() => {
   code: 'ERR_OUT_OF_RANGE',
   name: 'RangeError',
   message: 'The value of "offset" is out of range. ' +
-           'It must be >= 0 && <= 4. Received -1'
+           'It must be >= 0. Received -1'
 });
 
 assert.throws(() => {
@@ -136,5 +136,18 @@ assert.throws(() => {
   code: 'ERR_OUT_OF_RANGE',
   name: 'RangeError',
   message: 'The value of "length" is out of range. ' +
-           'It must be >= 0 && <= 4. Received -1'
+           'It must be >= 0. Received -1'
+});
+
+assert.throws(() => {
+  fs.readSync(fd,
+              Buffer.allocUnsafe(expected.length),
+              0,
+              expected.length + 1,
+              0);
+}, {
+  code: 'ERR_OUT_OF_RANGE',
+  name: 'RangeError',
+  message: 'The value of "length" is out of range. ' +
+           'It must be <= 4. Received 5'
 });