src/node_main_instance.cc

@@ -66,16 +66,23 @@ NodeMainInstance::~NodeMainInstance() {
     return;
   }
 
+  {
 #ifdef DEBUG
-  // node::Environment has been disposed and no JavaScript Execution is allowed
-  // at this point.
-  Isolate::DisallowJavascriptExecutionScope disallow_js(
-      isolate_, Isolate::DisallowJavascriptExecutionScope::CRASH_ON_FAILURE);
+    // node::Environment has been disposed and no JavaScript Execution is
+    // allowed at this point.
+    // Create a scope to check that no JavaScript is executed in debug build
+    // and proactively crash the process in the case JavaScript is being
+    // executed.
+    // Isolate::Dispose() must be invoked outside of this scope to avoid
+    // use-after-free.
+    Isolate::DisallowJavascriptExecutionScope disallow_js(
+        isolate_, Isolate::DisallowJavascriptExecutionScope::CRASH_ON_FAILURE);
 #endif
-  // This should only be done on a main instance that owns its isolate.
-  // IsolateData must be freed before UnregisterIsolate() is called.
-  isolate_data_.reset();
-  platform_->UnregisterIsolate(isolate_);
+    // This should only be done on a main instance that owns its isolate.
+    // IsolateData must be freed before UnregisterIsolate() is called.
+    isolate_data_.reset();
+    platform_->UnregisterIsolate(isolate_);
+  }
   isolate_->Dispose();
 }