diff options
| author | Roman Genkhel <roman.genhel@lge.com> | 2022-04-28 12:53:38 +0300 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2022-05-10 06:24:03 +0000 |
| commit | 18168641fd1f2295044d5e41c112a753a5701e2b (patch) | |
| tree | 9fd403be2f48b1cb5d5ba71cbef4e06eb2f2d720 | |
| parent | 5d1b6d4058b3802c5fd7dc05973b00eb8c8bfd9f (diff) | |
Fix: Access nullptr returned by QWaylandSurface::client()
surface()->client() could return null at the moment when
QWaylandQuickItem::takeFocus invoked, which cause using nullptr
Pick-to: 6.2 6.3
Change-Id: I89432882bd7117f45bac889bc85b2f86c77b21e8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -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 07130a8a6..9a46d1492 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; |