worker: fix crash when a worker joins after exit

Qard · targos · commit 8325fa5c04fa · 2024-12-13T16:52:59.000+01:00
If a worker has not already joined before running to completion it will join in a SetImmediateThreadsafe which could occur after the worker has already ended by other means. Mutating a JS object at that point would fail because the isolate is already disposed. PR-URL: #56191 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
diff --git a/src/node_worker.cc b/src/node_worker.cc
@@ -449,6 +449,9 @@ void Worker::JoinThread() {
 
   env()->remove_sub_worker_context(this);
 
+  // Join may happen after the worker exits and disposes the isolate
+  if (!env()->can_call_into_js()) return;
+
   {
     HandleScope handle_scope(env()->isolate());
     Context::Scope context_scope(env()->context());

Original file line number	Diff line number	Diff line change
`@@ -449,6 +449,9 @@ void Worker::JoinThread() {`
`449`	`449`
`450`	`450`	`env()->remove_sub_worker_context(this);`
`451`	`451`
	`452`	`+ // Join may happen after the worker exits and disposes the isolate`
	`453`	`+ if (!env()->can_call_into_js()) return;`
	`454`	`+`
`452`	`455`	`{`
`453`	`456`	`HandleScope handle_scope(env()->isolate());`
`454`	`457`	`Context::Scope context_scope(env()->context());`