nodejs
diff --git a/‎src/api/environment.cc‎
Lines changed: 0 additions & 7 deletions b/‎src/api/environment.cc‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎src/node_main_instance.cc‎
Lines changed: 18 additions & 4 deletions b/‎src/node_main_instance.cc‎
Lines changed: 18 additions & 4 deletions
diff --git a/‎src/node_platform.cc‎
Lines changed: 5 additions & 0 deletions b/‎src/node_platform.cc‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎test/parallel/test-finalization-registry-shutdown.js‎
Lines changed: 23 additions & 0 deletions b/‎test/parallel/test-finalization-registry-shutdown.js‎
Lines changed: 23 additions & 0 deletions
@@ -512,13 +512,6 @@ void FreeEnvironment(Environment* env) {
     RunAtExit(env);
   }
 
-  // This call needs to be made while the `Environment` is still alive
-  // because we assume that it is available for async tracking in the
-  // NodePlatform implementation.
-  MultiIsolatePlatform* platform = env->isolate_data()->platform();
-  if (platform != nullptr)
-    platform->DrainTasks(isolate);
-
   delete env;
 }
 
 
@@ -65,10 +65,24 @@ NodeMainInstance::~NodeMainInstance() {
   if (isolate_params_ == nullptr) {
     return;
   }
-  // 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_);
+
+  {
+#ifdef DEBUG
+    // 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_);
+  }
   isolate_->Dispose();
 }
 
 
@@ -424,6 +424,11 @@ void PerIsolatePlatformData::RunForegroundTask(std::unique_ptr<Task> task) {
                                    InternalCallbackScope::kNoFlags);
     task->Run();
   } else {
+    // When the Environment was freed, the tasks of the Isolate should also be
+    // canceled by `NodePlatform::UnregisterIsolate`. However, if the embedder
+    // request to run the foreground task after the Environment was freed, run
+    // the task without InternalCallbackScope.
+
     // The task is moved out of InternalCallbackScope if env is not available.
     // This is a required else block, and should not be removed.
     // See comment: https://github.com/nodejs/node/pull/34688#pullrequestreview-463867489
 
@@ -0,0 +1,23 @@
+// Flags: --expose-gc
+'use strict';
+const common = require('../common');
+
+// This test verifies that when a V8 FinalizationRegistryCleanupTask is queue
+// at the last moment when JavaScript can be executed, the callback of a
+// FinalizationRegistry will not be invoked and the process should exit
+// normally.
+
+const reg = new FinalizationRegistry(
+  common.mustNotCall('This FinalizationRegistry callback should never be called'));
+
+function register() {
+  // Create a temporary object in a new function scope to allow it to be GC-ed.
+  reg.register({});
+}
+
+process.on('exit', () => {
+  // This is the final chance to execute JavaScript.
+  register();
+  // Queue a FinalizationRegistryCleanupTask by a testing gc request.
+  global.gc();
+});
Original file line number	Diff line number	Diff line change
@@ -512,13 +512,6 @@ void FreeEnvironment(Environment* env) {
512	512	RunAtExit(env);
513	513	}
514	514
515		- // This call needs to be made while the `Environment` is still alive
516		- // because we assume that it is available for async tracking in the
517		- // NodePlatform implementation.
518		- MultiIsolatePlatform* platform = env->isolate_data()->platform();
519		- if (platform != nullptr)
520		- platform->DrainTasks(isolate);
521		-
522	515	delete env;
523	516	}
524	517