fs: update validateOffsetLengthRead in utils.js

daemon1024 · targos · commit 2093f13333c5 · 2020-05-13T17:52:47.000+02:00
PR-URL: #32896 Fixes: #32871 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Andrey Pechkurov <apechkurov@gmail.com>
diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
@@ -506,13 +506,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'
 });
 
@@ -59,7 +59,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'
 });
 
 
@@ -96,7 +96,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(() => {
@@ -109,5 +109,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'
 });
