From 9250bd7a4bf4f104f5550ebe03340cd6c136fa45 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Tue, 14 Jun 2022 17:17:33 +0200 Subject: Fix potential nullptr access in the compositor when killing clients Change-Id: Ie9e0a61fb26a305bc5b913dc95bdf31c1e7cb408 Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit d35d759f1a710d44cedae22b24508ead60dabe6f) Reviewed-by: Qt Cherry-pick Bot --- src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp | 4 ++-- 1 file 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); } -- cgit v1.2.1