readline: fix detection of carriage return

Fixes: #45992 PR-URL: #46306 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]>
nodejs · Jan 31, 2023 · 4ae2492 · 4ae2492
1 parent 1d44017
commit 4ae2492
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 42 deletions.
diff --git a/lib/internal/readline/interface.js b/lib/internal/readline/interface.js
@@ -598,6 +598,7 @@ class Interface extends InterfaceConstructor {
       if (this[kLine_buffer]) {
         string = this[kLine_buffer] + string;
         this[kLine_buffer] = null;
+        lineEnding.lastIndex = 0; // Start the search from the beginning of the string.
         newPartContainsEnding = RegExpPrototypeExec(lineEnding, string);
       }
       this[kSawReturnAt] = StringPrototypeEndsWith(string, '\r') ?

diff --git a/test/known_issues/test-readline-big-file-carriage-return.js b/test/known_issues/test-readline-big-file-carriage-return.js
diff --git a/test/parallel/test-readline-carriage-return-between-chunks.js b/test/parallel/test-readline-carriage-return-between-chunks.js
@@ -0,0 +1,23 @@
+'use strict';
+
+const common = require('../common');
+
+const assert = require('node:assert');
+const readline = require('node:readline');
+const { Readable } = require('node:stream');
+
+
+const input = Readable.from((function*() {
+  yield 'a\nb';
+  yield '\r\n';
+})());
+const rl = readline.createInterface({ input, crlfDelay: Infinity });
+let carriageReturns = 0;
+
+rl.on('line', (line) => {
+  if (line.includes('\r')) carriageReturns++;
+});
+
+rl.on('close', common.mustCall(() => {
+  assert.strictEqual(carriageReturns, 0);
+}));