From d13a29182801fad6398e13c0fcdcabff949c7d6c Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Fri, 15 Dec 2023 08:57:47 +0000 Subject: [PATCH] client: Clean up text input proxy object in textinputv2 This not only cleans up a tiny amount of memory, but also fixes a potential crash if a wayland event were to arrive on the object after the Qt level wrapper is destroyed. Pick-to: 6.5 6.6 6.7 Change-Id: I6fafdd848d61da893304c4467a57b52d3771c508 Reviewed-by: Liang Qi --- src/plugins/platforms/wayland/qwaylandtextinputv2.cpp | 1 + tests/auto/wayland/shared/textinput.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandtextinputv2.cpp b/src/plugins/platforms/wayland/qwaylandtextinputv2.cpp index a799793e5b8..89a8a6d77d7 100644 --- a/src/plugins/platforms/wayland/qwaylandtextinputv2.cpp +++ b/src/plugins/platforms/wayland/qwaylandtextinputv2.cpp @@ -46,6 +46,7 @@ QWaylandTextInputv2::~QWaylandTextInputv2() { if (m_resetCallback) wl_callback_destroy(m_resetCallback); + destroy(); } void QWaylandTextInputv2::reset() diff --git a/tests/auto/wayland/shared/textinput.cpp b/tests/auto/wayland/shared/textinput.cpp index 05889687c00..ee7e9ff9b29 100644 --- a/tests/auto/wayland/shared/textinput.cpp +++ b/tests/auto/wayland/shared/textinput.cpp @@ -12,9 +12,8 @@ TextInputManager::TextInputManager(CoreCompositor *compositor) void TextInputManager::zwp_text_input_manager_v2_get_text_input(Resource *resource, uint32_t id, wl_resource *seatResource) { - Q_UNUSED(resource); - Q_UNUSED(id); Q_UNUSED(seatResource); + add(resource->client(), id, resource->version()); } } // namespace MockCompositor