TS: Fix skewed arrays due to recursive call

asger-semmle · asger-semmle · commit e9159acecb2f · 2019-09-02T13:03:25.000+01:00
diff --git a/javascript/extractor/lib/typescript/src/type_table.ts b/javascript/extractor/lib/typescript/src/type_table.ts
@@ -974,8 +974,10 @@ export class TypeTable {
             if (superType == null) continue;
             let baseTypeSymbol = superType.symbol;
             if (baseTypeSymbol == null) continue;
+            let baseId = this.getSymbolId(baseTypeSymbol);
+            // Note: take care not to perform a recursive call between the two `push` calls.
             this.baseTypes.symbols.push(symbolId);
-            this.baseTypes.baseTypeSymbols.push(this.getSymbolId(baseTypeSymbol));
+            this.baseTypes.baseTypeSymbols.push(baseId);
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -974,8 +974,10 @@ export class TypeTable {`
`974`	`974`	`if (superType == null) continue;`
`975`	`975`	`let baseTypeSymbol = superType.symbol;`
`976`	`976`	`if (baseTypeSymbol == null) continue;`
	`977`	`+ let baseId = this.getSymbolId(baseTypeSymbol);`
	`978`	+ // Note: take care not to perform a recursive call between the two `push` calls.
`977`	`979`	`this.baseTypes.symbols.push(symbolId);`
`978`		`- this.baseTypes.baseTypeSymbols.push(this.getSymbolId(baseTypeSymbol));`
	`980`	`+ this.baseTypes.baseTypeSymbols.push(baseId);`
`979`	`981`	`}`
`980`	`982`	`}`
`981`	`983`	`}`