From 1ac7bf1ed45644b68b8cbf24b34aa39a812b7739 Mon Sep 17 00:00:00 2001 From: Lu YaNing Date: Tue, 7 Jul 2020 09:18:16 +0800 Subject: Linux: fix crash in AtSpi adaptor when handling window activation fix The window has been quickly activated or disabled will cause a crash . Fixes: QTBUG-84643 Pick-to: 5.15 Change-Id: I0fd0918a3fc1898ddffd97009a4e92702ecd9ed4 Reviewed-by: Volker Hilsheimer --- src/gui/accessible/linux/atspiadaptor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui/accessible') diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp index 8d53be8c42..a0c41fb7b3 100644 --- a/src/gui/accessible/linux/atspiadaptor.cpp +++ b/src/gui/accessible/linux/atspiadaptor.cpp @@ -804,7 +804,9 @@ void AtSpiAdaptor::windowActivated(QObject* window, bool active) return; QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(window); - Q_ASSERT(iface); + // If the window has been quickly activated or disabled, it will cause a crash. + if (iface == nullptr) + return; Q_ASSERT(!active || iface->isValid()); QString windowTitle; -- cgit v1.2.3