lib: add primordials.SafeStringIterator

aduh95 · danielleadams · commit 8ac2016229d5 · 2021-01-12T07:09:24.000-05:00
PR-URL: #36526 Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;

-Original file line number
+Diff line change
 // 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,
 copyPrototype(original.prototype,primordials,`${name}Prototype`);
 });
 +primordials.SafeStringIterator=createSafeIterator(
 +primordials.StringPrototypeSymbolIterator,
 +primordials.StringIteratorPrototypeNext
 +);
++
 Object.setPrototypeOf(primordials,null);
 Object.freeze(primordials);
-Original file line number
+Diff line change
  ReflectApply,
  RegExp,
  RegExpPrototypeToString,
 + SafeStringIterator,
  Set,
  SetPrototypeGetSize,
  SetPrototypeValues,
 if(removeControlChars)
 str=stripVTControlCharacters(str);
 str=str.normalize('NFC');
 -for(constcharofstr){
 +for(constcharofnewSafeStringIterator(str)){
 constcode=char.codePointAt(0);
 if(isFullWidthCodePoint(code)){
 width+=2;
-Original file line number
+Diff line change
  StringPrototypeTrim,
  Symbol,
  SymbolAsyncIterator,
 + SafeStringIterator,
 }=primordials;
 const{
 constcol=this.columns;
 letrows=0;
 str=stripVTControlCharacters(str);
 -for(constcharofstr){
 +for(constcharofnewSafeStringIterator(str)){
 if(char==='\n'){
 // Rows must be incremented by 1 even if offset = 0 or col = +Infinity.
 rows+=MathCeil(offset/col)||1;
 iface.isCompletionEnabled=false;
 letlength=0;
 -for(constcharacterofstring){
 +for(constcharacterofnewSafeStringIterator(string)){
 length+=character.length;
 if(length===string.length){
 iface.isCompletionEnabled=true;