From 295132deef776a9e7691b38c3db86f091227fcc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Wed, 9 Sep 2015 21:45:55 +0200 Subject: [PATCH] reset the transientInfo id when cleaning group otherwise a pseudo-transient window with no group causes a nullptr deref in eg. mainClients BUG: 352483 FIXED-IN: 5.4.2 REVIEW: 125122 --- group.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/group.cpp b/group.cpp index b878f3dc5f..434f787492 100644 --- a/group.cpp +++ b/group.cpp @@ -672,6 +672,7 @@ void Client::cleanGrouping() // it != group_members.end(); // ++it ) // qDebug() << "CL4:" << *it; + m_transientForId = XCB_WINDOW_NONE; } // Make sure that no group transient is considered transient @@ -886,6 +887,7 @@ ClientList Client::mainClients() const if (transientFor() != NULL) return ClientList() << const_cast< Client* >(transientFor()); ClientList result; + Q_ASSERT(group()); for (ClientList::ConstIterator it = group()->members().constBegin(); it != group()->members().constEnd(); ++it)