Skip to content

Commit 5b68416

Browse files
ASpoerlQt Cherry-pick Bot
authored andcommitted
Fix nullptr deref in QMenu::mouseReleaseEvent()
879eb2c introduced a nulltr deref. Amend the patch to fix it. Coverity-Id: 896788 Change-Id: Ic05db9f5bfb67ece01a0e030400697d97712646e Reviewed-by: Marc Mutz <[email protected]> (cherry picked from commit 8e89eef) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
1 parent fb124b8 commit 5b68416

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/widgets/widgets/qmenu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2945,7 +2945,7 @@ void QMenu::mouseReleaseEvent(QMouseEvent *e)
29452945
#endif
29462946
d->activateAction(action, QAction::Trigger);
29472947
}
2948-
} else if ((!action || action->isEnabled()) && !action->isSeparator()) {
2948+
} else if (!action || (action->isEnabled() && !action->isSeparator())) {
29492949
d->hideUpToMenuBar();
29502950
}
29512951
}

0 commit comments

Comments
 (0)