From eccc3c3ef0cba7b89da987de33549a5280462142 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 31 Jul 2019 10:00:16 +0200 Subject: [PATCH] WindowServer: Control WSClientConnection's window list teardown better A lot of things happen in response to window destruction, and some of them may call into the window's WSClientConnection and ask it to look through its window list. If we're right in the middle of tearing down the window list, it's not a great idea to start iterating over it. Fixes #386. --- Servers/WindowServer/WSClientConnection.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Servers/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp index 1dd139fd5f..6f79207a4e 100644 --- a/Servers/WindowServer/WSClientConnection.cpp +++ b/Servers/WindowServer/WSClientConnection.cpp @@ -50,6 +50,10 @@ WSClientConnection::WSClientConnection(CLocalSocket& client_socket, int client_i WSClientConnection::~WSClientConnection() { + // NOTE: Move the windows out of 'm_windows' before teardown. This prevents code + // that runs in response to window destruction from trying to iterate over + // a partially destroyed window list. + auto windows = move(m_windows); s_connections->remove(client_id()); }