!fixup fix infinite loop when loading the environment

nodejs · Mar 20, 2018 · 63901e8 · 63901e8
1 parent cf25dd3
commit 63901e8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/node-constants.cc b/src/node-constants.cc
@@ -1,4 +1,5 @@
 #include <lldb/API/LLDB.h>
+#include <set>
 
 #include "src/llv8-inl.h"
 #include "src/node-constants.h"
@@ -66,7 +67,13 @@ addr_t Environment::LoadCurrentEnvironment(Error& err) {
         continue;
       }
       bool found = false;
+      std::set<uint64_t> visited_contexts;
       while (!found) {
+        // Necessary to avoid an infinite loop.
+        if (visited_contexts.count(val.raw())) {
+          break;
+        }
+        visited_contexts.insert(val.raw());
         v8::Context context(val);
         v8::Value native = context.Native(v8_err);
         if (v8_err.Success()) {