From 8ac2016229d53795d7538ee2437cccff803a3100 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Fri, 4 Dec 2020 14:48:52 +0100
Subject: [PATCH] lib: add primordials.SafeStringIterator

PR-URL: https://github.com/nodejs/node/pull/36526
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 lib/internal/per_context/primordials.js        | 8 ++++++++
 lib/internal/repl/utils.js                     | 3 ++-
 lib/internal/source_map/prepare_stack_trace.js | 4 +++-
 lib/internal/util/inspect.js                   | 3 ++-
 lib/readline.js                                | 5 +++--
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/internal/per_context/primordials.js b/lib/internal/per_context/primordials.js
index 8bb7d41983262b..68c36229825f73 100644
--- a/lib/internal/per_context/primordials.js
+++ b/lib/internal/per_context/primordials.js
@@ -242,6 +242,9 @@ primordials.SafeWeakSet = makeSafe(
 // Refs: https://tc39.es/ecma262/#sec-%typedarray%-intrinsic-object
 [
   { name: 'TypedArray', original: Reflect.getPrototypeOf(Uint8Array) },
+  { name: 'StringIterator', original: {
+    prototype: Reflect.getPrototypeOf(String.prototype[Symbol.iterator]()),
+  } },
 ].forEach(({ name, original }) => {
   primordials[name] = original;
   // The static %TypedArray% methods require a valid `this`, but can't be bound,
@@ -250,5 +253,10 @@ primordials.SafeWeakSet = makeSafe(
   copyPrototype(original.prototype, primordials, `${name}Prototype`);
 });
 
+primordials.SafeStringIterator = createSafeIterator(
+  primordials.StringPrototypeSymbolIterator,
+  primordials.StringIteratorPrototypeNext
+);
+
 Object.setPrototypeOf(primordials, null);
 Object.freeze(primordials);
diff --git a/lib/internal/repl/utils.js b/lib/internal/repl/utils.js
index e2bda7665a9138..594b6a0c4485c7 100644
--- a/lib/internal/repl/utils.js
+++ b/lib/internal/repl/utils.js
@@ -9,6 +9,7 @@ const {
   MathMin,
   RegExpPrototypeTest,
   SafeSet,
+  SafeStringIterator,
   StringPrototypeEndsWith,
   StringPrototypeIndexOf,
   StringPrototypeLastIndexOf,
@@ -425,7 +426,7 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
           getStringWidth(inspected) > maxColumns) {
         maxColumns -= 4 + (repl.useColors ? 0 : 3);
         let res = '';
-        for (const char of inspected) {
+        for (const char of new SafeStringIterator(inspected)) {
           maxColumns -= getStringWidth(char);
           if (maxColumns < 0)
             break;
diff --git a/lib/internal/source_map/prepare_stack_trace.js b/lib/internal/source_map/prepare_stack_trace.js
index 60bcb2fcadd1a1..c32f9780c2fb3f 100644
--- a/lib/internal/source_map/prepare_stack_trace.js
+++ b/lib/internal/source_map/prepare_stack_trace.js
@@ -9,6 +9,7 @@ const {
   StringPrototypeSlice,
   StringPrototypeSplit,
   StringPrototypeStartsWith,
+  SafeStringIterator,
 } = primordials;
 
 let debug = require('internal/util/debuglog').debuglog('source_map', (fn) => {
@@ -144,7 +145,8 @@ function getErrorSource(
   // Display ^ in appropriate position, regardless of whether tabs or
   // spaces are used:
   let prefix = '';
-  for (const character of StringPrototypeSlice(line, 0, originalColumn + 1)) {
+  for (const character of new SafeStringIterator(
+    StringPrototypeSlice(line, 0, originalColumn + 1))) {
     prefix += (character === '\t') ? '\t' :
       StringPrototypeRepeat(' ', getStringWidth(character));
   }
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
index 17ca3f3d2b39ce..04b7b68c5d41c6 100644
--- a/lib/internal/util/inspect.js
+++ b/lib/internal/util/inspect.js
@@ -42,6 +42,7 @@ const {
   ReflectApply,
   RegExp,
   RegExpPrototypeToString,
+  SafeStringIterator,
   Set,
   SetPrototypeGetSize,
   SetPrototypeValues,
@@ -2005,7 +2006,7 @@ if (internalBinding('config').hasIntl) {
     if (removeControlChars)
       str = stripVTControlCharacters(str);
     str = str.normalize('NFC');
-    for (const char of str) {
+    for (const char of new SafeStringIterator(str)) {
       const code = char.codePointAt(0);
       if (isFullWidthCodePoint(code)) {
         width += 2;
diff --git a/lib/readline.js b/lib/readline.js
index 03e8b27db7ac75..8995fcbbf44335 100644
--- a/lib/readline.js
+++ b/lib/readline.js
@@ -59,6 +59,7 @@ const {
   StringPrototypeTrim,
   Symbol,
   SymbolAsyncIterator,
+  SafeStringIterator,
 } = primordials;
 
 const {
@@ -752,7 +753,7 @@ Interface.prototype._getDisplayPos = function(str) {
   const col = this.columns;
   let rows = 0;
   str = stripVTControlCharacters(str);
-  for (const char of str) {
+  for (const char of new SafeStringIterator(str)) {
     if (char === '\n') {
       // Rows must be incremented by 1 even if offset = 0 or col = +Infinity.
       rows += MathCeil(offset / col) || 1;
@@ -1168,7 +1169,7 @@ function emitKeypressEvents(stream, iface = {}) {
         iface.isCompletionEnabled = false;
 
         let length = 0;
-        for (const character of string) {
+        for (const character of new SafeStringIterator(string)) {
           length += character.length;
           if (length === string.length) {
             iface.isCompletionEnabled = true;