LibWeb: Disentangle both ends of a MessagePort at once
Some checks are pending
Package the js repl as a binary artifact / build-and-package (x86_64, ubuntu-24.04, Linux, Linux-x86_64) (push) Waiting to run
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Lint Code / lint (push) Waiting to run
Label PRs with merge conflicts / auto-labeler (push) Waiting to run
Push notes / build (push) Waiting to run
CI / Lagom (arm64, Sanitizer_CI, false, macos-15, macOS, Clang) (push) Waiting to run
CI / Lagom (x86_64, Fuzzers_CI, false, ubuntu-24.04, Linux, Clang) (push) Waiting to run
CI / Lagom (x86_64, Sanitizer_CI, false, ubuntu-24.04, Linux, GNU) (push) Waiting to run
CI / Lagom (x86_64, Sanitizer_CI, true, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (arm64, macos-15, macOS, macOS-universal2) (push) Waiting to run

Otherwise, the remote end believes it is still entangled and may try to
access its own (now null) remote port. This fixes a crash in WPT.
This commit is contained in:
Timothy Flynn 2025-05-23 15:16:23 -04:00 committed by Shannon Booth
parent ea44a1c2c7
commit fbd1f77161
Notes: github-actions[bot] 2025-05-23 22:47:58 +00:00
2 changed files with 17 additions and 1 deletions

View file

@ -147,9 +147,13 @@ WebIDL::ExceptionOr<void> MessagePort::transfer_receiving_steps(HTML::TransferDa
void MessagePort::disentangle()
{
if (m_remote_port) {
if (auto remote_port = m_remote_port) {
// Set the pointers to null before disentangling the remote port to prevent infinite recursion here.
m_remote_port->m_remote_port = nullptr;
m_remote_port = nullptr;
if (remote_port)
remote_port->disentangle();
}
if (m_transport) {