summaryrefslogtreecommitdiff
path: root/src/managers
diff options
context:
space:
mode:
authorTom Englund <tomenglund26@gmail.com>2024-05-03 15:42:08 +0200
committerGitHub <noreply@github.com>2024-05-03 14:42:08 +0100
commitd5bf15387ad3b4ee36cae7a3cd9f4a9c28790f2e (patch)
treed5c82bfa5c3c1aa2d35cdbb1ad67b3c37d17cbbb /src/managers
parent387127b12ab5df8f8f40e8da7d76f47636562cab (diff)
internal: fix a few asan reported leaks on exit of hyprland (#5852)
* notifications: free cairo images on destruction asan reports a leak on exit if we dont free the image we created in the draw function. add a destructor and free images on exit. * compositor: destroy wlroots types on exit there are a few types not being destroyed on exit and causing a leak on exit in wlroots reported by asan, add those. * cursormgr: ensure we destroy cursor mgr on exit add a destructor and call wlr_xcursor_manager_destroy on the manager on destruction, leak reported by asan. * keybindmgr: free state and keymap add missing keymap_unref on creation, and add a destructor and free the state on exit. leak reported by asan. * skeyboard: add destructor and free state free the state on destruction of keyboard, reported as leak by asan
Diffstat (limited to 'src/managers')
-rw-r--r--src/managers/CursorManager.cpp5
-rw-r--r--src/managers/CursorManager.hpp1
-rw-r--r--src/managers/KeybindManager.cpp6
-rw-r--r--src/managers/KeybindManager.hpp1
4 files changed, 13 insertions, 0 deletions
diff --git a/src/managers/CursorManager.cpp b/src/managers/CursorManager.cpp
index fa5ee8cd..3fcecfe4 100644
--- a/src/managers/CursorManager.cpp
+++ b/src/managers/CursorManager.cpp
@@ -53,6 +53,11 @@ CCursorManager::CCursorManager() {
static auto P = g_pHookSystem->hookDynamic("monitorLayoutChanged", [this](void* self, SCallbackInfo& info, std::any param) { this->updateTheme(); });
}
+CCursorManager::~CCursorManager() {
+ if (m_pWLRXCursorMgr)
+ wlr_xcursor_manager_destroy(m_pWLRXCursorMgr);
+}
+
void CCursorManager::dropBufferRef(CCursorManager::CCursorBuffer* ref) {
std::erase_if(m_vCursorBuffers, [ref](const auto& buf) { return buf.get() == ref; });
}
diff --git a/src/managers/CursorManager.hpp b/src/managers/CursorManager.hpp
index ff633592..629f29e1 100644
--- a/src/managers/CursorManager.hpp
+++ b/src/managers/CursorManager.hpp
@@ -13,6 +13,7 @@ struct wlr_xwayland;
class CCursorManager {
public:
CCursorManager();
+ ~CCursorManager();
wlr_buffer* getCursorBuffer();
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 1150ac2e..cfad932a 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -116,6 +116,11 @@ CKeybindManager::CKeybindManager() {
});
}
+CKeybindManager::~CKeybindManager() {
+ if (m_pXKBTranslationState)
+ xkb_state_unref(m_pXKBTranslationState);
+}
+
void CKeybindManager::addKeybind(SKeybind kb) {
m_lKeybinds.push_back(kb);
@@ -219,6 +224,7 @@ void CKeybindManager::updateXKBTranslationState() {
xkb_context_unref(PCONTEXT);
m_pXKBTranslationState = xkb_state_new(PKEYMAP);
+ xkb_keymap_unref(PKEYMAP);
}
bool CKeybindManager::ensureMouseBindState() {
diff --git a/src/managers/KeybindManager.hpp b/src/managers/KeybindManager.hpp
index deb25ae9..24e71c6a 100644
--- a/src/managers/KeybindManager.hpp
+++ b/src/managers/KeybindManager.hpp
@@ -58,6 +58,7 @@ struct SParsedKey {
class CKeybindManager {
public:
CKeybindManager();
+ ~CKeybindManager();
bool onKeyEvent(wlr_keyboard_key_event*, SKeyboard*);
bool onAxisEvent(wlr_pointer_axis_event*);