cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input/TI: avoid UAF in destroy

Browse source
This commit is contained in:
Vaxry 2026-01-05 16:25:46 +01:00 • committed by Vaxry
parent 97c8a2f1cf
commit 8eb3ecc755
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/managers/input/TextInput.cpp
View file

@ -22,13 +22,7 @@ void CTextInput::initCallbacks() {
m_listeners.disable = INPUT->m_events.disable.listen([this] { onDisabled(); }); m_listeners.disable = INPUT->m_events.disable.listen([this] { onDisabled(); });
m_listeners.commit = INPUT->m_events.onCommit.listen([this] { onCommit(); }); m_listeners.commit = INPUT->m_events.onCommit.listen([this] { onCommit(); });
m_listeners.reset = INPUT->m_events.reset.listen([this] { onReset(); }); m_listeners.reset = INPUT->m_events.reset.listen([this] { onReset(); });
m_listeners.destroy = INPUT->m_events.destroy.listen([this] { m_listeners.destroy = INPUT->m_events.destroy.listen([this] { destroy(); });
m_listeners.surfaceUnmap.reset();
m_listeners.surfaceDestroy.reset();
g_pInputManager->m_relay.removeTextInput(this);
if (!g_pInputManager->m_relay.getFocusedTextInput())
g_pInputManager->m_relay.deactivateIME(this);
});
if (Desktop::focusState()->surface() && Desktop::focusState()->surface()->client() == INPUT->client()) if (Desktop::focusState()->surface() && Desktop::focusState()->surface()->client() == INPUT->client())
enter(Desktop::focusState()->surface()); enter(Desktop::focusState()->surface());
@ -39,16 +33,20 @@ void CTextInput::initCallbacks() {
m_listeners.disable = INPUT->m_events.disable.listen([this] { onDisabled(); }); m_listeners.disable = INPUT->m_events.disable.listen([this] { onDisabled(); });
m_listeners.commit = INPUT->m_events.onCommit.listen([this] { onCommit(); }); m_listeners.commit = INPUT->m_events.onCommit.listen([this] { onCommit(); });
m_listeners.reset = INPUT->m_events.reset.listen([this] { onReset(); }); m_listeners.reset = INPUT->m_events.reset.listen([this] { onReset(); });
m_listeners.destroy = INPUT->m_events.destroy.listen([this] { m_listeners.destroy = INPUT->m_events.destroy.listen([this] { destroy(); });
m_listeners.surfaceUnmap.reset();
m_listeners.surfaceDestroy.reset();
g_pInputManager->m_relay.removeTextInput(this);
if (!g_pInputManager->m_relay.getFocusedTextInput())
g_pInputManager->m_relay.deactivateIME(this);
});
} }
} }
void CTextInput::destroy() {
m_listeners.surfaceUnmap.reset();
m_listeners.surfaceDestroy.reset();
g_pInputManager->m_relay.removeTextInput(this);
if (!g_pInputManager->m_relay.getFocusedTextInput())
g_pInputManager->m_relay.deactivateIME(nullptr, false);
}
void CTextInput::onEnabled(SP<CWLSurfaceResource> surfV1) { void CTextInput::onEnabled(SP<CWLSurfaceResource> surfV1) {
Log::logger->log(Log::DEBUG, "TI ENABLE"); Log::logger->log(Log::DEBUG, "TI ENABLE");

2
src/managers/input/TextInput.hpp
View file

@ -39,6 +39,8 @@ class CTextInput {
void setFocusedSurface(SP<CWLSurfaceResource> pSurface); void setFocusedSurface(SP<CWLSurfaceResource> pSurface);
void initCallbacks(); void initCallbacks();
void destroy();
WP<CWLSurfaceResource> m_focusedSurface; WP<CWLSurfaceResource> m_focusedSurface;
int m_enterLocks = 0; int m_enterLocks = 0;
WP<CTextInputV3> m_v3Input; WP<CTextInputV3> m_v3Input;