Commit bfd11d7
worker: fix crash when a worker joins after exit
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>1 parent d2f8222 commit bfd11d7
1 file changed
Lines changed: 3 additions & 0 deletions
| 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()); | |
0 commit comments