lib: refactor to avoid unsafe array iteration

PR-URL: #37029 Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Minwoo Jung <[email protected]> Reviewed-By: Zijian Liu <[email protected]>
nodejs · Jan 27, 2021 · 2e1e02a · 2e1e02a
1 parent da3a948
commit 2e1e02a
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/lib/internal/process/per_thread.js b/lib/internal/process/per_thread.js
@@ -5,6 +5,7 @@
 // thread and the worker threads.
 
 const {
+  ArrayPrototypeEvery,
   ArrayPrototypeMap,
   ArrayPrototypePush,
   ArrayPrototypeSplice,
@@ -258,27 +259,24 @@ function buildAllowedFlags() {
   const { options, aliases } = require('internal/options');
 
   const allowedNodeEnvironmentFlags = [];
-  for (const [name, info] of options) {
+  for (const { 0: name, 1: info } of options) {
     if (info.envVarSettings === kAllowedInEnvironment) {
       ArrayPrototypePush(allowedNodeEnvironmentFlags, name);
     }
   }
 
-  for (const [ from, expansion ] of aliases) {
-    let isAccepted = true;
-    for (const to of expansion) {
-      if (!StringPrototypeStartsWith(to, '-') || to === '--') continue;
-      const recursiveExpansion = aliases.get(to);
-      if (recursiveExpansion) {
-        if (recursiveExpansion[0] === to)
-          ArrayPrototypeSplice(recursiveExpansion, 0, 1);
-        ArrayPrototypePush(expansion, ...recursiveExpansion);
-        continue;
-      }
-      isAccepted = options.get(to).envVarSettings === kAllowedInEnvironment;
-      if (!isAccepted) break;
+  function isAccepted(to) {
+    if (!StringPrototypeStartsWith(to, '-') || to === '--') return true;
+    const recursiveExpansion = aliases.get(to);
+    if (recursiveExpansion) {
+      if (recursiveExpansion[0] === to)
+        ArrayPrototypeSplice(recursiveExpansion, 0, 1);
+      return ArrayPrototypeEvery(recursiveExpansion, isAccepted);
     }
-    if (isAccepted) {
+    return options.get(to).envVarSettings === kAllowedInEnvironment;
+  }
+  for (const { 0: from, 1: expansion } of aliases) {
+    if (ArrayPrototypeEvery(expansion, isAccepted)) {
       let canonical = from;
       if (StringPrototypeEndsWith(canonical, '='))
         canonical = StringPrototypeSlice(canonical, 0, canonical.length - 1);