From e507f93c74c02ecc6e63c18d797bfeeca167155d Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Mon, 9 Apr 2018 23:02:08 +0530
Subject: [PATCH 01/26] fs: improve argument handling for ReadStream

Improve handling of erratic arguments in fs.ReadStream

Refs: https://github.com/nodejs/node/pull/19732
---
 lib/fs.js | 66 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 6c8417030b7ac7..3abe0c4f23cbc4 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2013,31 +2013,55 @@ function ReadStream(path, options) {
   this.bytesRead = 0;
   this.closed = false;
 
-  if (this.start !== undefined) {
-    if (typeof this.start !== 'number' || Number.isNaN(this.start)) {
-      throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
-    }
-    if (this.end === undefined) {
-      this.end = Infinity;
-    } else if (typeof this.end !== 'number' || Number.isNaN(this.end)) {
-      throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
-    }
+  // Case 0: If either start or end is undefined, set them to defaults
+  // (0, Infinity) respectively.
+  this.start = this.start === undefined ? 0 : this.start;
+  this.end = this.end === undefined ? Infinity : this.end;
 
-    if (this.start > this.end) {
-      const errVal = `{start: ${this.start}, end: ${this.end}}`;
-      throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);
-    }
+  // Case 1: If the type of either start or end is not number, throw
+  // ERR_INVALID_ARG_TYPE (TypeError).
+  if (typeof this.start !== 'number') {
+    throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
+  }
+  if (typeof this.end !== 'number') {
+    throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
+  }
 
-    this.pos = this.start;
+  // Case 2: If either start or end is NaN, throw ERR_OUT_OF_RANGE (RangeError).
+  if (Number.isNaN(this.start)) {
+    throw new ERR_OUT_OF_RANGE('start', 'not NaN', this.start);
+  }
+  if (Number.isNaN(this.end)) {
+    throw new ERR_OUT_OF_RANGE('end', 'not NaN', this.end);
   }
 
-  // Backwards compatibility: Make sure `end` is a number regardless of `start`.
-  // TODO(addaleax): Make the above typecheck not depend on `start` instead.
-  // (That is a semver-major change).
-  if (typeof this.end !== 'number')
-    this.end = Infinity;
-  else if (Number.isNaN(this.end))
-    throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
+  // Case 3: If either start or end is negative, throw ERR_OUT_OF_RANGE
+  // (RangeError).
+  if (this.start < 0) {
+    throw new ERR_OUT_OF_RANGE('start', 'positive', this.start);
+  }
+  if (this.end < 0) {
+    throw new ERR_OUT_OF_RANGE('end', 'positive', this.end);
+  }
+
+  // Case 4: If either start or end is fractional, round them to the nearest
+  // whole number. (Not integer as negatives not allowed)
+  if (!Number.isInteger(this.start)) {
+    this.start = Math.round(this.start);
+  }
+  if (!Number.isInteger(this.end)) {
+    this.end = Math.round(this.end);
+  }
+
+  // Case 5: If start and end are both whole numbers, work perfectly.
+
+  // Case 6: If start is greater than end, throw ERR_OUT_OF_RANGE (RangeError)
+  if (this.start > this.end) {
+    const errVal = `{start: ${this.start}, end: ${this.end}}`;
+    throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);
+  }
+
+  this.pos = this.start;
 
   if (typeof this.fd !== 'number')
     this.open();

From 30c285fc882d655373c6c6f4384ebf4744ea88a6 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Tue, 10 Apr 2018 16:05:37 +0530
Subject: [PATCH 02/26] test,fs: update tests for improvements in ReadStream

Add new tests and update existing ones reflecting the changes in how
ReadStream handles the `start` and `end` arguments.
---
 .../test-fs-read-stream-throw-type-error.js   | 65 ++++++++++++++-----
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/test/parallel/test-fs-read-stream-throw-type-error.js b/test/parallel/test-fs-read-stream-throw-type-error.js
index 5cba76fa394636..03aa306fffcb7d 100644
--- a/test/parallel/test-fs-read-stream-throw-type-error.js
+++ b/test/parallel/test-fs-read-stream-throw-type-error.js
@@ -13,23 +13,54 @@ fs.createReadStream(example, null);
 fs.createReadStream(example, 'utf8');
 fs.createReadStream(example, { encoding: 'utf8' });
 
-const createReadStreamErr = (path, opt) => {
-  common.expectsError(
-    () => {
-      fs.createReadStream(path, opt);
-    },
-    {
-      code: 'ERR_INVALID_ARG_TYPE',
-      type: TypeError
-    });
+const createReadStreamErr = (path, opt, error) => {
+  common.expectsError(() => {
+    fs.createReadStream(path, opt);
+  }, error);
 };
 
-createReadStreamErr(example, 123);
-createReadStreamErr(example, 0);
-createReadStreamErr(example, true);
-createReadStreamErr(example, false);
+const typeError = {
+  code: 'ERR_INVALID_ARG_TYPE',
+  type: TypeError
+};
+
+const rangeError = {
+  code: 'ERR_OUT_OF_RANGE',
+  type: RangeError
+};
+
+createReadStreamErr(example, 123, typeError);
+createReadStreamErr(example, 0, typeError);
+createReadStreamErr(example, true, typeError);
+createReadStreamErr(example, false, typeError);
+
+// Case 0: Should not throw if either start or end is undefined
+fs.createReadStream(example, {});
+fs.createReadStream(example, { start: 0 });
+fs.createReadStream(example, { end: Infinity });
+
+// Case 1: Should throw TypeError if either start or end is not of type 'number'
+createReadStreamErr(example, { start: 'invalid' }, typeError);
+createReadStreamErr(example, { end: 'invalid' }, typeError);
+createReadStreamErr(example, { start: 'invalid', end: 'invalid' }, typeError);
+
+// Case 2: Should throw RangeError if either start or end is NaN
+createReadStreamErr(example, { start: NaN }, rangeError);
+createReadStreamErr(example, { end: NaN }, rangeError);
+createReadStreamErr(example, { start: NaN, end: NaN }, rangeError);
+
+// Case 3: Should throw RangeError if either start or end is negative
+createReadStreamErr(example, { start: -1 }, rangeError);
+createReadStreamErr(example, { end: -1 }, rangeError);
+createReadStreamErr(example, { start: -1, end: -1 }, rangeError);
+
+// Case 4: Should not throw if either start or end is fractional
+fs.createReadStream(example, { start: 0.1 });
+fs.createReadStream(example, { end: 0.1 });
+fs.createReadStream(example, { start: 0.1, end: 0.1 });
+
+// Case 5: Should not throw if both start and end are whole numbers
+fs.createReadStream(example, { start: 1, end: 5 });
 
-// createReadSteam _should_ throw on NaN
-createReadStreamErr(example, { start: NaN });
-createReadStreamErr(example, { end: NaN });
-createReadStreamErr(example, { start: NaN, end: NaN });
+// Case 6: Should throw RangeError if start is greater than end
+createReadStreamErr(example, { start: 5, end: 1 }, rangeError);

From 915d77c2a41dbd04807475dfec25926050ce4cee Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 11 Apr 2018 02:13:02 +0530
Subject: [PATCH 03/26] Remove inconsistency

---
 lib/fs.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 3abe0c4f23cbc4..32d555c93e3fab 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2013,9 +2013,7 @@ function ReadStream(path, options) {
   this.bytesRead = 0;
   this.closed = false;
 
-  // Case 0: If either start or end is undefined, set them to defaults
-  // (0, Infinity) respectively.
-  this.start = this.start === undefined ? 0 : this.start;
+  // Case 0: If end is undefined, set it to default (Infinity)
   this.end = this.end === undefined ? Infinity : this.end;
 
   // Case 1: If the type of either start or end is not number, throw

From 17d6d55b473cd2fc704565cdcf452c725a64dfcc Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 11 Apr 2018 02:35:29 +0530
Subject: [PATCH 04/26] Separate testing for start and end

---
 lib/fs.js | 96 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 57 insertions(+), 39 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 32d555c93e3fab..ae1a0a8e3de6af 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2013,53 +2013,71 @@ function ReadStream(path, options) {
   this.bytesRead = 0;
   this.closed = false;
 
-  // Case 0: If end is undefined, set it to default (Infinity)
-  this.end = this.end === undefined ? Infinity : this.end;
+  if (this.start !== undefined) {
+    // Case 1: If the type of start is not 'number', throw ERR_INVALID_ARG_TYPE
+    // (TypeError).
+    if (typeof this.start !== 'number') {
+      throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
+    }
 
-  // Case 1: If the type of either start or end is not number, throw
-  // ERR_INVALID_ARG_TYPE (TypeError).
-  if (typeof this.start !== 'number') {
-    throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
-  }
-  if (typeof this.end !== 'number') {
-    throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
-  }
+    // Case 2: If start is NaN, throw ERR_OUT_OF_RANGE (RangeError).
+    if (Number.isNaN(this.start)) {
+      throw new ERR_OUT_OF_RANGE('start', 'not NaN', this.start);
+    }
 
-  // Case 2: If either start or end is NaN, throw ERR_OUT_OF_RANGE (RangeError).
-  if (Number.isNaN(this.start)) {
-    throw new ERR_OUT_OF_RANGE('start', 'not NaN', this.start);
-  }
-  if (Number.isNaN(this.end)) {
-    throw new ERR_OUT_OF_RANGE('end', 'not NaN', this.end);
-  }
+    // Case 3: If start is negative, throw ERR_OUT_OF_RANGE (RangeError).
+    if (this.start < 0) {
+      throw new ERR_OUT_OF_RANGE('start', 'positive', this.start);
+    }
 
-  // Case 3: If either start or end is negative, throw ERR_OUT_OF_RANGE
-  // (RangeError).
-  if (this.start < 0) {
-    throw new ERR_OUT_OF_RANGE('start', 'positive', this.start);
-  }
-  if (this.end < 0) {
-    throw new ERR_OUT_OF_RANGE('end', 'positive', this.end);
-  }
+    // Case 4: If start is fractional, round them to the nearest whole number.
+    // (Not integer as negatives not allowed)
+    if (!Number.isInteger(this.start)) {
+      this.start = Math.round(this.start);
+    }
+    if (!Number.isInteger(this.end)) {
+      this.end = Math.round(this.end);
+    }
 
-  // Case 4: If either start or end is fractional, round them to the nearest
-  // whole number. (Not integer as negatives not allowed)
-  if (!Number.isInteger(this.start)) {
-    this.start = Math.round(this.start);
-  }
-  if (!Number.isInteger(this.end)) {
-    this.end = Math.round(this.end);
-  }
+    // Case 5: If start is a whole number, work perfectly.
 
-  // Case 5: If start and end are both whole numbers, work perfectly.
+    // Case 6: If start is greater than end, throw ERR_OUT_OF_RANGE (RangeError)
+    if (this.start > this.end) {
+      const errVal = `{start: ${this.start}, end: ${this.end}}`;
+      throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);
+    }
 
-  // Case 6: If start is greater than end, throw ERR_OUT_OF_RANGE (RangeError)
-  if (this.start > this.end) {
-    const errVal = `{start: ${this.start}, end: ${this.end}}`;
-    throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);
+    this.pos = this.start;
   }
 
-  this.pos = this.start;
+  // Case 0: If end is undefined, set end to Infinity.
+  if (this.end === undefined) {
+    this.end = Infinity;
+  } else {
+    // Case 1: If the type of end is not 'number', throw ERR_INVALID_ARG_TYPE
+    // (TypeError).
+    if (typeof this.end !== 'number') {
+      throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
+    }
+
+    // Case 2: If end is NaN, throw ERR_OUT_OF_RANGE (RangeError).
+    if (Number.isNaN(this.end)) {
+      throw new ERR_OUT_OF_RANGE('end', 'not NaN', this.end);
+    }
+
+    // Case 3: If end is negative, throw ERR_OUT_OF_RANGE (RangeError).
+    if (this.end < 0) {
+      throw new ERR_OUT_OF_RANGE('end', 'positive', this.end);
+    }
+
+    // Case 4: If end is fractional, round them to the nearest whole number.
+    // (Not integer as negatives not allowed)
+    if (!Number.isInteger(this.end)) {
+      this.end = Math.round(this.end);
+    }
+
+    // Case 5: If end is a whole number, work perfectly.
+  }
 
   if (typeof this.fd !== 'number')
     this.open();

From 36574f46bc48d8a93e6f2697dcdb703eeb7de19e Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 11 Apr 2018 02:50:15 +0530
Subject: [PATCH 05/26] Remove invalid check

---
 lib/fs.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index ae1a0a8e3de6af..90d316763eaddf 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2035,9 +2035,6 @@ function ReadStream(path, options) {
     if (!Number.isInteger(this.start)) {
       this.start = Math.round(this.start);
     }
-    if (!Number.isInteger(this.end)) {
-      this.end = Math.round(this.end);
-    }
 
     // Case 5: If start is a whole number, work perfectly.
 

From e4415d5075cae3490cdb2f1a182e011a379b1b56 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 11 Apr 2018 03:09:00 +0530
Subject: [PATCH 06/26] Address comments regarding handling undefined

---
 lib/fs.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 90d316763eaddf..4e897d48b59de8 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2013,6 +2013,9 @@ function ReadStream(path, options) {
   this.bytesRead = 0;
   this.closed = false;
 
+  // Case 0: If end is undefined, set end to Infinity.
+  this.end = this.end === undefined ? Infinity : this.end;
+
   if (this.start !== undefined) {
     // Case 1: If the type of start is not 'number', throw ERR_INVALID_ARG_TYPE
     // (TypeError).
@@ -2047,10 +2050,7 @@ function ReadStream(path, options) {
     this.pos = this.start;
   }
 
-  // Case 0: If end is undefined, set end to Infinity.
-  if (this.end === undefined) {
-    this.end = Infinity;
-  } else {
+  if (this.end !== undefined) {
     // Case 1: If the type of end is not 'number', throw ERR_INVALID_ARG_TYPE
     // (TypeError).
     if (typeof this.end !== 'number') {

From b9466160e870d215dd1b14392e636bf4bdc1d7cc Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 11 Apr 2018 09:43:44 +0530
Subject: [PATCH 07/26] Refactor conditions

---
 lib/fs.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 4e897d48b59de8..263ed564f5cacc 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2013,9 +2013,6 @@ function ReadStream(path, options) {
   this.bytesRead = 0;
   this.closed = false;
 
-  // Case 0: If end is undefined, set end to Infinity.
-  this.end = this.end === undefined ? Infinity : this.end;
-
   if (this.start !== undefined) {
     // Case 1: If the type of start is not 'number', throw ERR_INVALID_ARG_TYPE
     // (TypeError).
@@ -2041,16 +2038,13 @@ function ReadStream(path, options) {
 
     // Case 5: If start is a whole number, work perfectly.
 
-    // Case 6: If start is greater than end, throw ERR_OUT_OF_RANGE (RangeError)
-    if (this.start > this.end) {
-      const errVal = `{start: ${this.start}, end: ${this.end}}`;
-      throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);
-    }
-
     this.pos = this.start;
   }
 
-  if (this.end !== undefined) {
+  // Case 0: If end is undefined, set end to Infinity.
+  if (this.end === undefined) {
+    this.end = Infinity;
+  } else {
     // Case 1: If the type of end is not 'number', throw ERR_INVALID_ARG_TYPE
     // (TypeError).
     if (typeof this.end !== 'number') {
@@ -2074,6 +2068,12 @@ function ReadStream(path, options) {
     }
 
     // Case 5: If end is a whole number, work perfectly.
+
+    // Case 6: If start is greater than end, throw ERR_OUT_OF_RANGE (RangeError)
+    if (this.start !== undefined && this.start > this.end) {
+      const errVal = `{start: ${this.start}, end: ${this.end}}`;
+      throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);
+    }
   }
 
   if (typeof this.fd !== 'number')

From d00b46a033472767fd34f67793aea766718cce76 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sat, 14 Apr 2018 01:19:31 +0530
Subject: [PATCH 08/26] fs,doc: add documentation regarding changes to
 createReadStream

Reflect the changes made to the fs.createReadStream function to the
documentation at doc/api/fs.md

Ref: https://github.com/nodejs/node/pull/19898
Ref: https://github.com/nodejs/node/pull/19898#issue-180377160
---
 doc/api/fs.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index 6fc7075d182451..6c714724a5e0ee 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1325,6 +1325,19 @@ start counting at 0. If `fd` is specified and `start` is omitted or `undefined`,
 `fs.createReadStream()` reads sequentially from the current file position.
 The `encoding` can be any one of those accepted by [`Buffer`][].
 
+The following rules apply to the `start` and `end` values:
+
+- If `end` is omitted or set to undefined, then it will be coerced to `Infinity`.
+- The type of both `start` and `end` needs to be `number`. If not, then the
+function would throw a `TypeError` with the code `ERR_INVALID_ARG_TYPE`.
+- Both `start` and `end` should be valid values (i.e. they should neither be
+negative nor `NaN`, and `start` should not be greater than `end`). If they are,
+the function would throw a `RangeError` with the code `ERR_OUT_OF_RANGE`.
+- Both `start` and `end` should be integer values. If they are not, then they
+are rounded to the closest integer using `Math.round`.
+- If none of the above rules apply, then the function works without any quirks
+as expected.
+
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
 the specified file descriptor. This means that no `'open'` event will be
 emitted. Note that `fd` should be blocking; non-blocking `fd`s should be passed

From 93b0915afe8cfcbaa2a0aee507e8bbf2bd501e5f Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sat, 14 Apr 2018 20:13:26 +0530
Subject: [PATCH 09/26] Add a changes block and move new documentation towards
 the end

---
 doc/api/fs.md | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index 6c714724a5e0ee..ebdb73c494fdfb 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1291,6 +1291,11 @@ fs.copyFileSync('source.txt', 'destination.txt', COPYFILE_EXCL);
 <!-- YAML
 added: v0.1.31
 changes:
+  - version: v10.0.0
+    pr-url: https://github.com/nodejs/node/pull/19898
+    description: Impose new restrictions on `start` and `end`, throwing
+                 more appropriate errors in cases when we cannot reasonably
+                 handle the input values.
   - version: v7.6.0
     pr-url: https://github.com/nodejs/node/pull/10739
     description: The `path` parameter can be a WHATWG `URL` object using
@@ -1325,19 +1330,6 @@ start counting at 0. If `fd` is specified and `start` is omitted or `undefined`,
 `fs.createReadStream()` reads sequentially from the current file position.
 The `encoding` can be any one of those accepted by [`Buffer`][].
 
-The following rules apply to the `start` and `end` values:
-
-- If `end` is omitted or set to undefined, then it will be coerced to `Infinity`.
-- The type of both `start` and `end` needs to be `number`. If not, then the
-function would throw a `TypeError` with the code `ERR_INVALID_ARG_TYPE`.
-- Both `start` and `end` should be valid values (i.e. they should neither be
-negative nor `NaN`, and `start` should not be greater than `end`). If they are,
-the function would throw a `RangeError` with the code `ERR_OUT_OF_RANGE`.
-- Both `start` and `end` should be integer values. If they are not, then they
-are rounded to the closest integer using `Math.round`.
-- If none of the above rules apply, then the function works without any quirks
-as expected.
-
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
 the specified file descriptor. This means that no `'open'` event will be
 emitted. Note that `fd` should be blocking; non-blocking `fd`s should be passed
@@ -1360,6 +1352,19 @@ fs.createReadStream('sample.txt', { start: 90, end: 99 });
 
 If `options` is a string, then it specifies the encoding.
 
+The following rules apply to the `start` and `end` values:
+
+- If `end` is omitted or set to undefined, then it will be coerced to `Infinity`.
+- The type of both `start` and `end` needs to be `number`. If not, then the
+function would throw a `TypeError` with the code `ERR_INVALID_ARG_TYPE`.
+- Both `start` and `end` should be valid values (i.e. they should neither be
+negative nor `NaN`, and `start` should not be greater than `end`). If they are,
+the function would throw a `RangeError` with the code `ERR_OUT_OF_RANGE`.
+- Both `start` and `end` should be integer values. If they are not, then they
+are rounded to the closest integer using `Math.round`.
+- If none of the above rules apply, then the function works without any quirks
+as expected.
+
 ## fs.createWriteStream(path[, options])
 <!-- YAML
 added: v0.1.31

From 5d03199b2688da21d9cf4b5b1dce9753fd24ee7e Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sat, 14 Apr 2018 20:43:22 +0530
Subject: [PATCH 10/26] Replace version by REPLACEME

---
 doc/api/fs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index ebdb73c494fdfb..d40b689ca78cd6 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1291,7 +1291,7 @@ fs.copyFileSync('source.txt', 'destination.txt', COPYFILE_EXCL);
 <!-- YAML
 added: v0.1.31
 changes:
-  - version: v10.0.0
+  - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/19898
     description: Impose new restrictions on `start` and `end`, throwing
                  more appropriate errors in cases when we cannot reasonably

From 047529b7e6931a00a33074fbce2d271224d9afea Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sun, 15 Apr 2018 20:13:22 +0530
Subject: [PATCH 11/26] Minimize comments and documentation

---
 doc/api/fs.md | 33 ++++++++++++++++++++-------------
 lib/fs.js     | 18 ------------------
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index d40b689ca78cd6..7a912fe30639db 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1324,12 +1324,32 @@ Be aware that, unlike the default value set for `highWaterMark` on a
 readable stream (16 kb), the stream returned by this method has a
 default value of 64 kb for the same parameter.
 
+<<<<<<< HEAD
+=======
+`options` is an object or string with the following defaults:
+
+```js
+const defaults = {
+  end: Infinity,
+  flags: 'r',
+  encoding: null,
+  fd: null,
+  mode: 0o666,
+  autoClose: true,
+  highWaterMark: 64 * 1024
+};
+```
+
+>>>>>>> Minimize comments and documentation
 `options` can include `start` and `end` values to read a range of bytes from
 the file instead of the entire file. Both `start` and `end` are inclusive and
 start counting at 0. If `fd` is specified and `start` is omitted or `undefined`,
 `fs.createReadStream()` reads sequentially from the current file position.
 The `encoding` can be any one of those accepted by [`Buffer`][].
 
+If `start` or `end` are not integers, then they are rounded to the closest
+integer using `Math.round`.
+
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
 the specified file descriptor. This means that no `'open'` event will be
 emitted. Note that `fd` should be blocking; non-blocking `fd`s should be passed
@@ -1352,19 +1372,6 @@ fs.createReadStream('sample.txt', { start: 90, end: 99 });
 
 If `options` is a string, then it specifies the encoding.
 
-The following rules apply to the `start` and `end` values:
-
-- If `end` is omitted or set to undefined, then it will be coerced to `Infinity`.
-- The type of both `start` and `end` needs to be `number`. If not, then the
-function would throw a `TypeError` with the code `ERR_INVALID_ARG_TYPE`.
-- Both `start` and `end` should be valid values (i.e. they should neither be
-negative nor `NaN`, and `start` should not be greater than `end`). If they are,
-the function would throw a `RangeError` with the code `ERR_OUT_OF_RANGE`.
-- Both `start` and `end` should be integer values. If they are not, then they
-are rounded to the closest integer using `Math.round`.
-- If none of the above rules apply, then the function works without any quirks
-as expected.
-
 ## fs.createWriteStream(path[, options])
 <!-- YAML
 added: v0.1.31
diff --git a/lib/fs.js b/lib/fs.js
index 263ed564f5cacc..ead38b77efa430 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2014,62 +2014,44 @@ function ReadStream(path, options) {
   this.closed = false;
 
   if (this.start !== undefined) {
-    // Case 1: If the type of start is not 'number', throw ERR_INVALID_ARG_TYPE
-    // (TypeError).
     if (typeof this.start !== 'number') {
       throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
     }
 
-    // Case 2: If start is NaN, throw ERR_OUT_OF_RANGE (RangeError).
     if (Number.isNaN(this.start)) {
       throw new ERR_OUT_OF_RANGE('start', 'not NaN', this.start);
     }
 
-    // Case 3: If start is negative, throw ERR_OUT_OF_RANGE (RangeError).
     if (this.start < 0) {
       throw new ERR_OUT_OF_RANGE('start', 'positive', this.start);
     }
 
-    // Case 4: If start is fractional, round them to the nearest whole number.
-    // (Not integer as negatives not allowed)
     if (!Number.isInteger(this.start)) {
       this.start = Math.round(this.start);
     }
 
-    // Case 5: If start is a whole number, work perfectly.
-
     this.pos = this.start;
   }
 
-  // Case 0: If end is undefined, set end to Infinity.
   if (this.end === undefined) {
     this.end = Infinity;
   } else {
-    // Case 1: If the type of end is not 'number', throw ERR_INVALID_ARG_TYPE
-    // (TypeError).
     if (typeof this.end !== 'number') {
       throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
     }
 
-    // Case 2: If end is NaN, throw ERR_OUT_OF_RANGE (RangeError).
     if (Number.isNaN(this.end)) {
       throw new ERR_OUT_OF_RANGE('end', 'not NaN', this.end);
     }
 
-    // Case 3: If end is negative, throw ERR_OUT_OF_RANGE (RangeError).
     if (this.end < 0) {
       throw new ERR_OUT_OF_RANGE('end', 'positive', this.end);
     }
 
-    // Case 4: If end is fractional, round them to the nearest whole number.
-    // (Not integer as negatives not allowed)
     if (!Number.isInteger(this.end)) {
       this.end = Math.round(this.end);
     }
 
-    // Case 5: If end is a whole number, work perfectly.
-
-    // Case 6: If start is greater than end, throw ERR_OUT_OF_RANGE (RangeError)
     if (this.start !== undefined && this.start > this.end) {
       const errVal = `{start: ${this.start}, end: ${this.end}}`;
       throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);

From a90457b8eb05d01548bb5d47723f8e5a67eb7fca Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sun, 15 Apr 2018 21:12:55 +0530
Subject: [PATCH 12/26] Address nit by adding parens

---
 doc/api/fs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index 7a912fe30639db..bc35bf3024f1b5 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1348,7 +1348,7 @@ start counting at 0. If `fd` is specified and `start` is omitted or `undefined`,
 The `encoding` can be any one of those accepted by [`Buffer`][].
 
 If `start` or `end` are not integers, then they are rounded to the closest
-integer using `Math.round`.
+integer using `Math.round()`.
 
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
 the specified file descriptor. This means that no `'open'` event will be

From c3be59a823b6a7697e18a06d6ff5c7ffb5559e07 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Tue, 17 Apr 2018 03:21:00 +0530
Subject: [PATCH 13/26] Resolve merge conflict

---
 doc/api/fs.md | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index bc35bf3024f1b5..3530e67ee7e03c 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1324,23 +1324,6 @@ Be aware that, unlike the default value set for `highWaterMark` on a
 readable stream (16 kb), the stream returned by this method has a
 default value of 64 kb for the same parameter.
 
-<<<<<<< HEAD
-=======
-`options` is an object or string with the following defaults:
-
-```js
-const defaults = {
-  end: Infinity,
-  flags: 'r',
-  encoding: null,
-  fd: null,
-  mode: 0o666,
-  autoClose: true,
-  highWaterMark: 64 * 1024
-};
-```
-
->>>>>>> Minimize comments and documentation
 `options` can include `start` and `end` values to read a range of bytes from
 the file instead of the entire file. Both `start` and `end` are inclusive and
 start counting at 0. If `fd` is specified and `start` is omitted or `undefined`,

From 41b3a2edaf2123889f2207cce4cea3db3d768ecc Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sat, 21 Apr 2018 01:02:33 +0530
Subject: [PATCH 14/26] Thow RangeError on fractional values

---
 lib/fs.js                                             | 4 ++--
 test/parallel/test-fs-read-stream-throw-type-error.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index ead38b77efa430..c91ae5a8b1c6f0 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2027,7 +2027,7 @@ function ReadStream(path, options) {
     }
 
     if (!Number.isInteger(this.start)) {
-      this.start = Math.round(this.start);
+      throw new ERR_OUT_OF_RANGE('start', 'integer', this.start);
     }
 
     this.pos = this.start;
@@ -2049,7 +2049,7 @@ function ReadStream(path, options) {
     }
 
     if (!Number.isInteger(this.end)) {
-      this.end = Math.round(this.end);
+      throw new ERR_OUT_OF_RANGE('start', 'integer', this.end);
     }
 
     if (this.start !== undefined && this.start > this.end) {
diff --git a/test/parallel/test-fs-read-stream-throw-type-error.js b/test/parallel/test-fs-read-stream-throw-type-error.js
index 03aa306fffcb7d..b7a7e9b0628cbe 100644
--- a/test/parallel/test-fs-read-stream-throw-type-error.js
+++ b/test/parallel/test-fs-read-stream-throw-type-error.js
@@ -54,10 +54,10 @@ createReadStreamErr(example, { start: -1 }, rangeError);
 createReadStreamErr(example, { end: -1 }, rangeError);
 createReadStreamErr(example, { start: -1, end: -1 }, rangeError);
 
-// Case 4: Should not throw if either start or end is fractional
-fs.createReadStream(example, { start: 0.1 });
-fs.createReadStream(example, { end: 0.1 });
-fs.createReadStream(example, { start: 0.1, end: 0.1 });
+// Case 4: Should throw RangeError if either start or end is fractional
+createReadStreamErr(example, { start: 0.1 }, rangeError);
+createReadStreamErr(example, { end: 0.1 }, rangeError);
+createReadStreamErr(example, { start: 0.1, end: 0.1 }, rangeError);
 
 // Case 5: Should not throw if both start and end are whole numbers
 fs.createReadStream(example, { start: 1, end: 5 });

From 3530baa467a1d559600af38ed66f19e8ac0671b3 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Tue, 24 Apr 2018 01:30:08 +0530
Subject: [PATCH 15/26] Cleanup fs.md

---
 doc/api/fs.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index 3530e67ee7e03c..ce3ff1a8a0b2e8 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1330,9 +1330,6 @@ start counting at 0. If `fd` is specified and `start` is omitted or `undefined`,
 `fs.createReadStream()` reads sequentially from the current file position.
 The `encoding` can be any one of those accepted by [`Buffer`][].
 
-If `start` or `end` are not integers, then they are rounded to the closest
-integer using `Math.round()`.
-
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
 the specified file descriptor. This means that no `'open'` event will be
 emitted. Note that `fd` should be blocking; non-blocking `fd`s should be passed

From 4863dbac9ee238e14e4a197e6db0fdeec2c5b417 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 25 Apr 2018 01:50:15 +0530
Subject: [PATCH 16/26] Fix error

---
 lib/fs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fs.js b/lib/fs.js
index c91ae5a8b1c6f0..db7ab21b7c88bc 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2049,7 +2049,7 @@ function ReadStream(path, options) {
     }
 
     if (!Number.isInteger(this.end)) {
-      throw new ERR_OUT_OF_RANGE('start', 'integer', this.end);
+      throw new ERR_OUT_OF_RANGE('end', 'integer', this.end);
     }
 
     if (this.start !== undefined && this.start > this.end) {

From 1cf1814d922818b38416d5803a5f41d937fae218 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 25 Apr 2018 22:57:09 +0530
Subject: [PATCH 17/26] Fix failures

---
 lib/fs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fs.js b/lib/fs.js
index db7ab21b7c88bc..8f698d02291a49 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2033,7 +2033,7 @@ function ReadStream(path, options) {
     this.pos = this.start;
   }
 
-  if (this.end === undefined) {
+  if (this.end === undefined || this.end === Infinity) {
     this.end = Infinity;
   } else {
     if (typeof this.end !== 'number') {

From 2c356282cef4135e553220488ebc45de4cfe8ca8 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Thu, 26 Apr 2018 07:43:40 +0530
Subject: [PATCH 18/26] Address nit

---
 lib/fs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 8f698d02291a49..ba4a24c9dcf99b 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2033,9 +2033,9 @@ function ReadStream(path, options) {
     this.pos = this.start;
   }
 
-  if (this.end === undefined || this.end === Infinity) {
+  if (this.end === undefined) {
     this.end = Infinity;
-  } else {
+  } else if (this.end !== Infinity) {
     if (typeof this.end !== 'number') {
       throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
     }

From a24f11532856a80a4f1ff59f24193a56b3afa6d8 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sat, 28 Apr 2018 00:42:48 +0530
Subject: [PATCH 19/26] Use isSafeInteger over isInteger

---
 lib/fs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index ba4a24c9dcf99b..57c83df2f85a47 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2026,7 +2026,7 @@ function ReadStream(path, options) {
       throw new ERR_OUT_OF_RANGE('start', 'positive', this.start);
     }
 
-    if (!Number.isInteger(this.start)) {
+    if (!Number.isSafeInteger(this.start)) {
       throw new ERR_OUT_OF_RANGE('start', 'integer', this.start);
     }
 
@@ -2048,7 +2048,7 @@ function ReadStream(path, options) {
       throw new ERR_OUT_OF_RANGE('end', 'positive', this.end);
     }
 
-    if (!Number.isInteger(this.end)) {
+    if (!Number.isSafeInteger(this.end)) {
       throw new ERR_OUT_OF_RANGE('end', 'integer', this.end);
     }
 

From 0368397c40f58a736d147cf15ab409e77afa15e0 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sun, 29 Apr 2018 10:59:05 +0530
Subject: [PATCH 20/26] Change error message

---
 lib/fs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 57c83df2f85a47..0a81b4753d6d62 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2027,7 +2027,7 @@ function ReadStream(path, options) {
     }
 
     if (!Number.isSafeInteger(this.start)) {
-      throw new ERR_OUT_OF_RANGE('start', 'integer', this.start);
+      throw new ERR_OUT_OF_RANGE('start', 'safe integer', this.start);
     }
 
     this.pos = this.start;
@@ -2049,7 +2049,7 @@ function ReadStream(path, options) {
     }
 
     if (!Number.isSafeInteger(this.end)) {
-      throw new ERR_OUT_OF_RANGE('end', 'integer', this.end);
+      throw new ERR_OUT_OF_RANGE('end', 'safe integer', this.end);
     }
 
     if (this.start !== undefined && this.start > this.end) {

From b6fa5154310068629170ce45216be266852113de Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sun, 6 May 2018 00:03:20 +0530
Subject: [PATCH 21/26] Improve error handling

---
 lib/fs.js | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 0a81b4753d6d62..f909b3abf070ac 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2014,20 +2014,15 @@ function ReadStream(path, options) {
   this.closed = false;
 
   if (this.start !== undefined) {
-    if (typeof this.start !== 'number') {
-      throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
-    }
-
-    if (Number.isNaN(this.start)) {
-      throw new ERR_OUT_OF_RANGE('start', 'not NaN', this.start);
+    if (!Number.isSafeInteger(this.start)) {
+      if (typeof this.start !== 'number')
+        throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
+      if (!Number.isInteger(this.start))
+        throw new ERR_OUT_OF_RANGE('start', 'an integer', this.start);
+      throw new ERR_OUT_OF_RANGE('start', '=> 0 and <= 2 ** 53 - 1', this.start);
     }
-
     if (this.start < 0) {
-      throw new ERR_OUT_OF_RANGE('start', 'positive', this.start);
-    }
-
-    if (!Number.isSafeInteger(this.start)) {
-      throw new ERR_OUT_OF_RANGE('start', 'safe integer', this.start);
+      throw new ERR_OUT_OF_RANGE('start', '=> 0 and <= 2 ** 53 - 1', this.start);
     }
 
     this.pos = this.start;
@@ -2036,25 +2031,21 @@ function ReadStream(path, options) {
   if (this.end === undefined) {
     this.end = Infinity;
   } else if (this.end !== Infinity) {
-    if (typeof this.end !== 'number') {
-      throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
-    }
-
-    if (Number.isNaN(this.end)) {
-      throw new ERR_OUT_OF_RANGE('end', 'not NaN', this.end);
+    if (!Number.isSafeInteger(this.end)) {
+      if (typeof this.end !== 'number')
+        throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
+      if (!Number.isInteger(this.end))
+        throw new ERR_OUT_OF_RANGE('end', 'an integer', this.end);
+      throw new ERR_OUT_OF_RANGE('end', '>= 0 and <= 2 ** 53 - 1', this.end);
     }
 
     if (this.end < 0) {
-      throw new ERR_OUT_OF_RANGE('end', 'positive', this.end);
-    }
-
-    if (!Number.isSafeInteger(this.end)) {
-      throw new ERR_OUT_OF_RANGE('end', 'safe integer', this.end);
+      throw new ERR_OUT_OF_RANGE('end', '>= 0 and <= 2 ** 53 - 1', this.end);
     }
 
     if (this.start !== undefined && this.start > this.end) {
       const errVal = `{start: ${this.start}, end: ${this.end}}`;
-      throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);
+      throw new ERR_OUT_OF_RANGE('start', `<= "end" (here: ${this.end})`, errVal);
     }
   }
 

From 7bda63c33ac3a56828265fbcebdb94dacc6f4c68 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Sun, 6 May 2018 00:10:24 +0530
Subject: [PATCH 22/26] Refactor fs tests for brevity

---
 .../test-fs-read-stream-throw-type-error.js   | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/test/parallel/test-fs-read-stream-throw-type-error.js b/test/parallel/test-fs-read-stream-throw-type-error.js
index b7a7e9b0628cbe..9886b3c9a46d97 100644
--- a/test/parallel/test-fs-read-stream-throw-type-error.js
+++ b/test/parallel/test-fs-read-stream-throw-type-error.js
@@ -29,35 +29,36 @@ const rangeError = {
   type: RangeError
 };
 
-createReadStreamErr(example, 123, typeError);
-createReadStreamErr(example, 0, typeError);
-createReadStreamErr(example, true, typeError);
-createReadStreamErr(example, false, typeError);
+[123, 0, true, false].forEach((opts) =>
+  createReadStreamErr(example, opts, typeError)
+);
 
 // Case 0: Should not throw if either start or end is undefined
-fs.createReadStream(example, {});
-fs.createReadStream(example, { start: 0 });
-fs.createReadStream(example, { end: Infinity });
+[{}, { start: 0 }, { end: Infinity }].forEach((opts) =>
+  fs.createReadStream(example, opts)
+);
 
 // Case 1: Should throw TypeError if either start or end is not of type 'number'
-createReadStreamErr(example, { start: 'invalid' }, typeError);
-createReadStreamErr(example, { end: 'invalid' }, typeError);
-createReadStreamErr(example, { start: 'invalid', end: 'invalid' }, typeError);
+[
+  { start: 'invalid' },
+  { end: 'invalid' },
+  { start: 'invalid', end: 'invalid' }
+].forEach((opts) => createReadStreamErr(example, opts, typeError));
 
 // Case 2: Should throw RangeError if either start or end is NaN
-createReadStreamErr(example, { start: NaN }, rangeError);
-createReadStreamErr(example, { end: NaN }, rangeError);
-createReadStreamErr(example, { start: NaN, end: NaN }, rangeError);
+[{ start: NaN }, { end: NaN }, { start: NaN, end: NaN }].forEach((opts) =>
+  createReadStreamErr(example, opts, rangeError)
+);
 
 // Case 3: Should throw RangeError if either start or end is negative
-createReadStreamErr(example, { start: -1 }, rangeError);
-createReadStreamErr(example, { end: -1 }, rangeError);
-createReadStreamErr(example, { start: -1, end: -1 }, rangeError);
+[{ start: -1 }, { end: -1 }, { start: -1, end: -1 }].forEach((opts) =>
+  createReadStreamErr(example, opts, rangeError)
+);
 
 // Case 4: Should throw RangeError if either start or end is fractional
-createReadStreamErr(example, { start: 0.1 }, rangeError);
-createReadStreamErr(example, { end: 0.1 }, rangeError);
-createReadStreamErr(example, { start: 0.1, end: 0.1 }, rangeError);
+[{ start: 0.1 }, { end: 0.1 }, { start: 0.1, end: 0.1 }].forEach((opts) =>
+  createReadStreamErr(example, opts, rangeError)
+);
 
 // Case 5: Should not throw if both start and end are whole numbers
 fs.createReadStream(example, { start: 1, end: 5 });

From c34ba43c12a520c0708649f8677ac86215b973a2 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 9 May 2018 01:24:56 +0530
Subject: [PATCH 23/26] Address nits

---
 lib/fs.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index f909b3abf070ac..6d1bec389286ad 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2019,10 +2019,10 @@ function ReadStream(path, options) {
         throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
       if (!Number.isInteger(this.start))
         throw new ERR_OUT_OF_RANGE('start', 'an integer', this.start);
-      throw new ERR_OUT_OF_RANGE('start', '=> 0 and <= 2 ** 53 - 1', this.start);
+      throw new ERR_OUT_OF_RANGE('start', '>= 0 and <= 2 ** 53 - 1', this.start);
     }
     if (this.start < 0) {
-      throw new ERR_OUT_OF_RANGE('start', '=> 0 and <= 2 ** 53 - 1', this.start);
+      throw new ERR_OUT_OF_RANGE('start', '>= 0 and <= 2 ** 53 - 1', this.start);
     }
 
     this.pos = this.start;
@@ -2044,8 +2044,7 @@ function ReadStream(path, options) {
     }
 
     if (this.start !== undefined && this.start > this.end) {
-      const errVal = `{start: ${this.start}, end: ${this.end}}`;
-      throw new ERR_OUT_OF_RANGE('start', `<= "end" (here: ${this.end})`, errVal);
+      throw new ERR_OUT_OF_RANGE('start', `<= "end" (here: ${this.end})`, this.start);
     }
   }
 

From 30e36c29702b71ce3203a9e6d6b241f061834248 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 9 May 2018 09:55:11 +0530
Subject: [PATCH 24/26] Update RangeError error message

---
 test/parallel/test-fs-read-stream.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-fs-read-stream.js b/test/parallel/test-fs-read-stream.js
index 870edf2820e87b..793b474c9b8292 100644
--- a/test/parallel/test-fs-read-stream.js
+++ b/test/parallel/test-fs-read-stream.js
@@ -148,8 +148,8 @@ common.expectsError(
   },
   {
     code: 'ERR_OUT_OF_RANGE',
-    message: 'The value of "start" is out of range. It must be <= "end". ' +
-             'Received {start: 10, end: 2}',
+    message: 'The value of "start" is out of range. It must be <= "end"' +
+             ' (here: 2). Received 10',
     type: RangeError
   });
 

From 9af225c1643f95484b7883388049d435768221d3 Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 9 May 2018 20:01:34 +0530
Subject: [PATCH 25/26] Update RangeError error message v2

---
 test/parallel/test-fs-read-stream-inherit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-fs-read-stream-inherit.js b/test/parallel/test-fs-read-stream-inherit.js
index f43f81ddee395d..a081302cc5a0f1 100644
--- a/test/parallel/test-fs-read-stream-inherit.js
+++ b/test/parallel/test-fs-read-stream-inherit.js
@@ -110,8 +110,8 @@ const rangeFile = fixtures.path('x.txt');
 
 {
   const message =
-    'The value of "start" is out of range. It must be <= "end". ' +
-    'Received {start: 10, end: 2}';
+    'The value of "start" is out of range. It must be <= "end" (here: 2).' +
+    ' Received 10';
 
   common.expectsError(
     () => {

From c76e75a3917d346862c40fcc72941188c5b0be1f Mon Sep 17 00:00:00 2001
From: Ujjwal Sharma <usharma1998@gmail.com>
Date: Wed, 9 May 2018 20:11:07 +0530
Subject: [PATCH 26/26] Fix lint errors

---
 lib/fs.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 6d1bec389286ad..2cecd5d2b41ce5 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2019,10 +2019,18 @@ function ReadStream(path, options) {
         throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
       if (!Number.isInteger(this.start))
         throw new ERR_OUT_OF_RANGE('start', 'an integer', this.start);
-      throw new ERR_OUT_OF_RANGE('start', '>= 0 and <= 2 ** 53 - 1', this.start);
+      throw new ERR_OUT_OF_RANGE(
+        'start',
+        '>= 0 and <= 2 ** 53 - 1',
+        this.start
+      );
     }
     if (this.start < 0) {
-      throw new ERR_OUT_OF_RANGE('start', '>= 0 and <= 2 ** 53 - 1', this.start);
+      throw new ERR_OUT_OF_RANGE(
+        'start',
+        '>= 0 and <= 2 ** 53 - 1',
+        this.start
+      );
     }
 
     this.pos = this.start;
@@ -2044,7 +2052,11 @@ function ReadStream(path, options) {
     }
 
     if (this.start !== undefined && this.start > this.end) {
-      throw new ERR_OUT_OF_RANGE('start', `<= "end" (here: ${this.end})`, this.start);
+      throw new ERR_OUT_OF_RANGE(
+        'start',
+        `<= "end" (here: ${this.end})`,
+        this.start
+      );
     }
   }