From 41066b009f69a3eaf3ad3196a2ff959853cc9321 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 6 Jul 2020 23:11:55 +0200 Subject: [PATCH] LibCore: Don't fire Socket::on_ready_to_read if !can_read() This is a bit of a pickle and I'm unsure what's the best behavior here. Since notifiers fire asynchronously via the event loop, we may end up firing a notifier for a socket fd, but then reading/writing that socket fd before ending up in the notifier callback. In that situation, the socket is no longer in the same state as it was when the event loop generated the notifier event. This patch stops Socket from firing one hook in this situation but this probably needs a global rethink. With this change, Browser starts reliably in multi-process mode. :^) --- Libraries/LibCore/Socket.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Libraries/LibCore/Socket.cpp b/Libraries/LibCore/Socket.cpp index e5d5411829..c8f07672f2 100644 --- a/Libraries/LibCore/Socket.cpp +++ b/Libraries/LibCore/Socket.cpp @@ -204,6 +204,8 @@ void Socket::ensure_read_notifier() ASSERT(m_connected); m_read_notifier = Notifier::construct(fd(), Notifier::Event::Read, this); m_read_notifier->on_ready_to_read = [this] { + if (!can_read()) + return; if (on_ready_to_read) on_ready_to_read(); };