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

client: Fix infinite recursion with text-input-v2

Browse Source 
It was possible to get into an infinite recursion when
double-clicking an entry in an item view to edit it.

What would happen is that the editor takes focus, and we call
commit on the input method commit in case the previous focused
widget has pending input that needs to be committed. The
subsequent method event then causes the QAbstractItemView to
set focus, and since we have not yet updated the focus in the
previous call, we end up in an infinite recursion, eventually
crashing when the stack overflows.

As a guard for this, we only send an input method event when there
is actually pre-edit text to commit, and we reset the pre-edit
text immediately so that any subsequent call will just exit.

[ChangeLog][QtWaylandClient] Fixed a possible crash when editing
a field in an item view.

Pick-to: 5.15 6.2 6.4 6.5
Fixes: QTBUG-109302
Change-Id: I45237c80e53b1386705279899e19319180d78fa1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Inho Lee <inho.lee@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2023-01-12 14:56:18 +01:00
parent 0c96282e97
commit f821878cd7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/wayland/qwaylandtextinputv2.cpp
View File

@ -58,9 +58,14 @@ void QWaylandTextInputv2::reset()
void QWaylandTextInputv2::commit()
{
if (QObject *o = QGuiApplication::focusObject()) {
QInputMethodEvent event;
event.setCommitString(m_preeditCommit);
QCoreApplication::sendEvent(o, &event);
if (!m_preeditCommit.isEmpty()) {
QInputMethodEvent event;
event.setCommitString(m_preeditCommit);
m_preeditCommit = QString();
QCoreApplication::sendEvent(o, &event);
}
}
reset();