From f2ffaba78c3439bf9895b0d3a9c23eaf9981a34e Mon Sep 17 00:00:00 2001
From: helloyou2012 <helloyou2012@yeah.net>
Date: Mon, 19 Apr 2021 18:01:49 +0800
Subject: [PATCH] stream: the position of _read() is wrong

Fixes: https://github.com/nodejs/node/issues/33940

PR-URL: https://github.com/nodejs/node/pull/38292
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
---
 lib/internal/fs/streams.js               |  8 +--
 test/parallel/test-fs-read-stream-pos.js | 69 ++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 test/parallel/test-fs-read-stream-pos.js

diff --git a/lib/internal/fs/streams.js b/lib/internal/fs/streams.js
index 57c2304fca82cc..b388bad80c74a5 100644
--- a/lib/internal/fs/streams.js
+++ b/lib/internal/fs/streams.js
@@ -255,6 +255,10 @@ ReadStream.prototype._read = function(n) {
       if (er) {
         errorOrDestroy(this, er);
       } else if (bytesRead > 0) {
+        if (this.pos !== undefined) {
+          this.pos += bytesRead;
+        }
+
         this.bytesRead += bytesRead;
 
         if (bytesRead !== buf.length) {
@@ -271,10 +275,6 @@ ReadStream.prototype._read = function(n) {
         this.push(null);
       }
     });
-
-  if (this.pos !== undefined) {
-    this.pos += n;
-  }
 };
 
 ReadStream.prototype._destroy = function(err, cb) {
diff --git a/test/parallel/test-fs-read-stream-pos.js b/test/parallel/test-fs-read-stream-pos.js
new file mode 100644
index 00000000000000..c9470cb23ddeb6
--- /dev/null
+++ b/test/parallel/test-fs-read-stream-pos.js
@@ -0,0 +1,69 @@
+'use strict';
+
+// Refs: https://github.com/nodejs/node/issues/33940
+
+const common = require('../common');
+const tmpdir = require('../common/tmpdir');
+const fs = require('fs');
+const assert = require('assert');
+const path = require('path');
+
+tmpdir.refresh();
+
+const file = path.join(tmpdir.path, '/read_stream_pos_test.txt');
+
+fs.writeFileSync(file, '');
+
+let counter = 0;
+
+setInterval(() => {
+  counter = counter + 1;
+  const line = `hello at ${counter}\n`;
+  fs.writeFileSync(file, line, { flag: 'a' });
+}, 1);
+
+const hwm = 10;
+let bufs = [];
+let isLow = false;
+let cur = 0;
+let stream;
+
+setInterval(() => {
+  if (stream) return;
+
+  stream = fs.createReadStream(file, {
+    highWaterMark: hwm,
+    start: cur
+  });
+  stream.on('data', common.mustCallAtLeast((chunk) => {
+    cur += chunk.length;
+    bufs.push(chunk);
+    if (isLow) {
+      const brokenLines = Buffer.concat(bufs).toString()
+        .split('\n')
+        .filter((line) => {
+          const s = 'hello at'.slice(0, line.length);
+          if (line && !line.startsWith(s)) {
+            return true;
+          }
+          return false;
+        });
+      assert.strictEqual(brokenLines.length, 0);
+      process.exit();
+      return;
+    }
+    if (chunk.length !== hwm) {
+      isLow = true;
+    }
+  }));
+  stream.on('end', () => {
+    stream = null;
+    isLow = false;
+    bufs = [];
+  });
+}, 10);
+
+// Time longer than 90 seconds to exit safely
+setTimeout(() => {
+  process.exit();
+}, 90000);