diff options
| author | Roman Genkhel <roman.genhel@lge.com> | 2022-04-28 12:53:38 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-10 08:03:49 +0000 |
| commit | 9f40a68f9b404fba2f39e0d734ca84b91236b68b (patch) | |
| tree | 549d8c67684e22e03325994e58f480442ed3e33d | |
| parent | 779dd71eaa6d4e71add9867f9ba874d5124529b2 (diff) | |
| download | qtwayland-9f40a68f9b404fba2f39e0d734ca84b91236b68b.tar.gz | |
Fix: Access nullptr returned by QWaylandSurface::client()
surface()->client() could return null at the moment when
QWaylandQuickItem::takeFocus invoked, which cause using nullptr
Change-Id: I89432882bd7117f45bac889bc85b2f86c77b21e8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 18168641fd1f2295044d5e41c112a753a5701e2b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index bf1d0a44..63be7ada 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -1115,7 +1115,7 @@ void QWaylandQuickItem::takeFocus(QWaylandSeat *device) { forceActiveFocus(); - if (!surface()) + if (!surface() || !surface()->client()) return; QWaylandSeat *target = device; |