perf_hooks: refactor to avoid unsafe array iteration

aduh95 · targos · commit 4686f4f41b0a · 2021-06-11T09:29:54.000+02:00
PR-URL: #36723 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
@@ -3,6 +3,7 @@
 const {
 ArrayIsArray,
 ArrayPrototypeFilter,
+ ArrayPrototypeForEach,
 ArrayPrototypeIncludes,
 ArrayPrototypeMap,
 ArrayPrototypePush,
@@ -367,13 +368,13 @@ class PerformanceObserver extends AsyncResource {
 disconnect() {
 const observerCountsGC = observerCounts[NODE_PERFORMANCE_ENTRY_TYPE_GC];
 const types = this[kTypes];
- for (const key of ObjectKeys(types)) {
+ ArrayPrototypeForEach(ObjectKeys(types), (key) => {
 const item = types[key];
 if (item) {
 L.remove(item);
 observerCounts[key]--;
 }
- }
+ });
 this[kTypes] = {};
 if (observerCountsGC === 1 &&
 observerCounts[NODE_PERFORMANCE_ENTRY_TYPE_GC] === 0) {
@@ -400,14 +401,14 @@ class PerformanceObserver extends AsyncResource {
 this[kBuffer][kEntries] = [];
 L.init(this[kBuffer][kEntries]);
 this[kBuffering] = Boolean(options.buffered);
- for (const entryType of filteredEntryTypes) {
+ ArrayPrototypeForEach(filteredEntryTypes, (entryType) => {
 const list = getObserversList(entryType);
- if (this[kTypes][entryType]) continue;
+ if (this[kTypes][entryType]) return;
 const item = { obs: this };
 this[kTypes][entryType] = item;
 L.append(list, item);
 observerCounts[entryType]++;
- }
+ });
 if (observerCountsGC === 0 &&
 observerCounts[NODE_PERFORMANCE_ENTRY_TYPE_GC] === 1) {
 installGarbageCollectionTracking();
@@ -635,6 +636,7 @@ function sortedInsert(list, entry) {
 }
 
 class ELDHistogram extends Histogram {
+ constructor(i) { super(i); } // eslint-disable-line no-useless-constructor
 enable() { return this[kHandle].enable(); }
 disable() { return this[kHandle].disable(); }
 }

-Original file line number
+Diff line change
 const{
  ArrayIsArray,
  ArrayPrototypeFilter,
 + ArrayPrototypeForEach,
  ArrayPrototypeIncludes,
  ArrayPrototypeMap,
  ArrayPrototypePush,
 disconnect(){
 constobserverCountsGC=observerCounts[NODE_PERFORMANCE_ENTRY_TYPE_GC];
 consttypes=this[kTypes];
 -for(constkeyofObjectKeys(types)){
 +ArrayPrototypeForEach(ObjectKeys(types),(key)=>{
 constitem=types[key];
 if(item){
 L.remove(item);
 observerCounts[key]--;
+}
 -}
 +});
 this[kTypes]={};
 if(observerCountsGC===1&&
 observerCounts[NODE_PERFORMANCE_ENTRY_TYPE_GC]===0){
 this[kBuffer][kEntries]=[];
 L.init(this[kBuffer][kEntries]);
 this[kBuffering]=Boolean(options.buffered);
 -for(constentryTypeoffilteredEntryTypes){
 +ArrayPrototypeForEach(filteredEntryTypes,(entryType)=>{
 constlist=getObserversList(entryType);
 -if(this[kTypes][entryType])continue;
 +if(this[kTypes][entryType])return;
 constitem={obs: this};
 this[kTypes][entryType]=item;
 L.append(list,item);
 observerCounts[entryType]++;
 -}
 +});
 if(observerCountsGC===0&&
 observerCounts[NODE_PERFORMANCE_ENTRY_TYPE_GC]===1){
 installGarbageCollectionTracking();
+}
 classELDHistogramextendsHistogram{
 +constructor(i){super(i);}// eslint-disable-line no-useless-constructor
 enable(){returnthis[kHandle].enable();}
 disable(){returnthis[kHandle].disable();}
+}