yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Safely remove all internal clients and override-redirect windows

Browse source 
When we destroy all internal clients and override-redirect windows, we
assume that corresponding lists will be implicitly detached.

However, in some cases, that might be not the case. For example, if the
list is not shared, neither begin() nor end() will detach. Therefore, it
is possible to hit invalidated iterators if the list is modified inside
the loop.

This change prevents hitting invalidated iterators by making explicit
list copies.

CCBUG: 427373
This commit is contained in:
Vlad Zahorodnii 2020-10-09 18:58:51 +03:00
parent a5b811dadb
commit 08263b534d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
workspace.cpp
View file

@ -469,7 +469,9 @@ void Workspace::cleanupX11()
stacking_order.removeOne(client);
}
for (Unmanaged *overrideRedirect : m_unmanaged) {
// We need a shadow copy because windows get removed as we go through them.
const QList<Unmanaged *> unmanaged = m_unmanaged;
for (Unmanaged *overrideRedirect : unmanaged) {
overrideRedirect->release(ReleaseReason::KWinShutsDown);
unconstrained_stacking_order.removeOne(overrideRedirect);
stacking_order.removeOne(overrideRedirect);
@ -510,7 +512,9 @@ Workspace::~Workspace()
}
}
for (InternalClient *client : m_internalClients) {
// We need a shadow copy because clients get removed as we go through them.
const QList<InternalClient *> internalClients = m_internalClients;
for (InternalClient *client : internalClients) {
client->destroyClient();
}