diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2022-06-14 17:17:33 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-17 13:49:14 +0000 |
| commit | 9250bd7a4bf4f104f5550ebe03340cd6c136fa45 (patch) | |
| tree | 3e8ec4d14c127be212d4d1e7e20d51fd1cec4aab | |
| parent | bbd060c9b8e03958e23f354617d35a907e2aefb9 (diff) | |
| download | qtwayland-9250bd7a4bf4f104f5550ebe03340cd6c136fa45.tar.gz | |
Fix potential nullptr access in the compositor when killing clients
Change-Id: Ie9e0a61fb26a305bc5b913dc95bdf31c1e7cb408
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit d35d759f1a710d44cedae22b24508ead60dabe6f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp index d6621759..1070faa2 100644 --- a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp +++ b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp @@ -196,14 +196,14 @@ QWaylandInputMethodControlPrivate::QWaylandInputMethodControlPrivate(QWaylandSur QWaylandQtTextInputMethod *QWaylandInputMethodControlPrivate::textInputMethod() const { - if (!surface->client()->textInputProtocols().testFlag(QWaylandClient::TextInputProtocol::QtTextInputMethodV1)) + if (!surface->client() || !surface->client()->textInputProtocols().testFlag(QWaylandClient::TextInputProtocol::QtTextInputMethodV1)) return nullptr; return QWaylandQtTextInputMethod::findIn(seat); } QWaylandTextInput *QWaylandInputMethodControlPrivate::textInput() const { - if (!surface->client()->textInputProtocols().testFlag(QWaylandClient::TextInputProtocol::TextInputV2)) + if (!surface->client() || !surface->client()->textInputProtocols().testFlag(QWaylandClient::TextInputProtocol::TextInputV2)) return nullptr; return QWaylandTextInput::findIn(seat); } |