From f3919e94486bb4673de3ef7412591848d6770ac2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 27 Jun 2023 13:21:04 +0200 Subject: [PATCH] client: check nullptr before usage in QWaylandInputContext::textInput() and QWaylandInputMethodContext::textInputMethod() Fixes: QTBUG-114671 Pick-to: 6.6 6.5 6.2 Change-Id: I10e55f6f817a4b4d78a0262f87580d2fa2743f7b Reviewed-by: David Edmundson --- src/plugins/platforms/wayland/qwaylandinputcontext.cpp | 2 +- src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp index 3af55bccbfb..369a4e5c281 100644 --- a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp @@ -206,7 +206,7 @@ void QWaylandInputContext::setFocusObject(QObject *object) QWaylandTextInputInterface *QWaylandInputContext::textInput() const { - return mDisplay->defaultInputDevice()->textInput(); + return mDisplay->defaultInputDevice() ? mDisplay->defaultInputDevice()->textInput() : nullptr; } #if QT_CONFIG(xkbcommon) diff --git a/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp index 85cd427146b..f03d8fb748d 100644 --- a/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp @@ -387,7 +387,7 @@ void QWaylandInputMethodContext::setFocusObject(QObject *) QWaylandTextInputMethod *QWaylandInputMethodContext::textInputMethod() const { - return m_display->defaultInputDevice()->textInputMethod(); + return m_display->defaultInputDevice() ? m_display->defaultInputDevice()->textInputMethod() : nullptr; } } // QtWaylandClient