[vm] Fix use-after-free of isolate_groups_rwlock_ during shutdown.

rmacnak-google · Commit Queue · commit 391b9eeda43f · 2025-03-17T15:28:29.000-07:00
TEST=ffi/async_void_function_callbacks_test Bug: #53248 Change-Id: I83370f2725f8b8a6bcd2fa1e5ebea2e11ae9606e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/415982 Commit-Queue: Ryan Macnak <rmacnak@google.com> Reviewed-by: Alexander Aprelev <aam@google.com>
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
@@ -565,8 +565,7 @@ void IsolateGroup::Shutdown() {
                    Dart::UptimeMillis(), name);
     }
     MonitorLocker ml(Isolate::isolate_creation_monitor_);
-    if (!Isolate::creation_enabled_ &&
-        !IsolateGroup::HasApplicationIsolateGroups()) {
+    if (!Isolate::creation_enabled_) {
       ml.Notify();
     }
     if (trace_shutdown) {

Original file line number	Diff line number	Diff line change
`@@ -565,8 +565,7 @@ void IsolateGroup::Shutdown() {`
`565`	`565`	`Dart::UptimeMillis(), name);`
`566`	`566`	`}`
`567`	`567`	`MonitorLocker ml(Isolate::isolate_creation_monitor_);`
`568`		`- if (!Isolate::creation_enabled_ &&`
`569`		`- !IsolateGroup::HasApplicationIsolateGroups()) {`
	`568`	`+ if (!Isolate::creation_enabled_) {`
`570`	`569`	`ml.Notify();`
`571`	`570`	`}`
`572`	`571`	`if (trace_shutdown) {`