From dae4bd8489993a250cfd7890ec963bf8190a7a97 Mon Sep 17 00:00:00 2001 From: Yan Shapochnik Date: Wed, 11 Apr 2012 15:02:49 -0400 Subject: Fix possible crash issue when testing the state of a QAccessibleMenuItem The owner widget of a QAccessibleMenuItem may be NULL. Checking for a valid pointer before dereferncing. Port of Qt 4 patch. Change-Id: Ic3149ccc5d6ae0ebc83dae58163ae2f60397fd28 (cherry picked from commit 3f526366af14f6c640dd52cd089b00776ab06731) Reviewed-by: Frederik Gladhorn --- src/plugins/accessible/widgets/qaccessiblemenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/accessible/widgets/qaccessiblemenu.cpp') diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp index d3ca1629bd..6009d25977 100644 --- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp +++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp @@ -249,7 +249,7 @@ QAccessible::State QAccessibleMenuItem::state() const QAccessible::State s; QWidget *own = owner(); - if (own->testAttribute(Qt::WA_WState_Visible) == false || m_action->isVisible() == false) { + if (own && own->testAttribute(Qt::WA_WState_Visible) == false || m_action->isVisible() == false) { s.invisible = true; } @@ -262,7 +262,7 @@ QAccessible::State QAccessibleMenuItem::state() const s.focused = true; #endif } - if (own->style()->styleHint(QStyle::SH_Menu_MouseTracking)) + if (own && own->style()->styleHint(QStyle::SH_Menu_MouseTracking)) s.hotTracked = true; if (m_action->isSeparator() || !m_action->isEnabled()) s.disabled = true; -- cgit v1.2.3