1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client: check nullptr before usage

Browse Source 
in QWaylandInputContext::textInput() and QWaylandInputMethodContext::textInputMethod()

Fixes: QTBUG-114671
Pick-to: 6.6 6.5 6.2
Change-Id: I10e55f6f817a4b4d78a0262f87580d2fa2743f7b
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Liang Qi 2023-06-27 13:21:04 +02:00
parent be0dfe986e
commit f3919e9448
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -206,7 +206,7 @@ void QWaylandInputContext::setFocusObject(QObject *object)
QWaylandTextInputInterface *QWaylandInputContext::textInput() const QWaylandTextInputInterface *QWaylandInputContext::textInput() const
{ {
return mDisplay->defaultInputDevice()->textInput(); return mDisplay->defaultInputDevice() ? mDisplay->defaultInputDevice()->textInput() : nullptr;
} }
#if QT_CONFIG(xkbcommon) #if QT_CONFIG(xkbcommon)

2
src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp
View File

@ -387,7 +387,7 @@ void QWaylandInputMethodContext::setFocusObject(QObject *)
QWaylandTextInputMethod *QWaylandInputMethodContext::textInputMethod() const QWaylandTextInputMethod *QWaylandInputMethodContext::textInputMethod() const
{ {
return m_display->defaultInputDevice()->textInputMethod(); return m_display->defaultInputDevice() ? m_display->defaultInputDevice()->textInputMethod() : nullptr;
} }
} // QtWaylandClient } // QtWaylandClient