Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix a few asan reported issues and a coredump on exit #6285

Merged
merged 3 commits into from
Jun 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/debug/HyprCtl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1625,6 +1625,11 @@ CHyprCtl::CHyprCtl() {
startHyprCtlSocket();
}

CHyprCtl::~CHyprCtl() {
if (m_eventSource)
wl_event_source_remove(m_eventSource);
}

SP<SHyprCtlCommand> CHyprCtl::registerCommand(SHyprCtlCommand cmd) {
return m_vCommands.emplace_back(makeShared<SHyprCtlCommand>(cmd));
}
Expand Down Expand Up @@ -1805,5 +1810,5 @@ void CHyprCtl::startHyprCtlSocket() {

Debug::log(LOG, "Hypr socket started at {}", socketPath);

wl_event_loop_add_fd(g_pCompositor->m_sWLEventLoop, m_iSocketFD, WL_EVENT_READABLE, hyprCtlFDTick, nullptr);
m_eventSource = wl_event_loop_add_fd(g_pCompositor->m_sWLEventLoop, m_iSocketFD, WL_EVENT_READABLE, hyprCtlFDTick, nullptr);
}
2 changes: 2 additions & 0 deletions src/debug/HyprCtl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
class CHyprCtl {
public:
CHyprCtl();
~CHyprCtl();

std::string makeDynamicCall(const std::string& input);
SP<SHyprCtlCommand> registerCommand(SHyprCtlCommand cmd);
Expand All @@ -25,6 +26,7 @@ class CHyprCtl {
void startHyprCtlSocket();

std::vector<SP<SHyprCtlCommand>> m_vCommands;
wl_event_source* m_eventSource = nullptr;
};

inline std::unique_ptr<CHyprCtl> g_pHyprCtl;
7 changes: 6 additions & 1 deletion src/managers/eventLoop/EventLoopManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ CEventLoopManager::CEventLoopManager() {
m_sTimers.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
}

CEventLoopManager::~CEventLoopManager() {
if (m_sWayland.eventSource)
wl_event_source_remove(m_sWayland.eventSource);
}

static int timerWrite(int fd, uint32_t mask, void* data) {
g_pEventLoopManager->onTimerFire();
return 1;
Expand All @@ -22,7 +27,7 @@ void CEventLoopManager::enterLoop(wl_display* display, wl_event_loop* wlEventLoo
m_sWayland.loop = wlEventLoop;
m_sWayland.display = display;

wl_event_loop_add_fd(wlEventLoop, m_sTimers.timerfd, WL_EVENT_READABLE, timerWrite, nullptr);
m_sWayland.eventSource = wl_event_loop_add_fd(wlEventLoop, m_sTimers.timerfd, WL_EVENT_READABLE, timerWrite, nullptr);

wl_display_run(display);

Expand Down
6 changes: 4 additions & 2 deletions src/managers/eventLoop/EventLoopManager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
class CEventLoopManager {
public:
CEventLoopManager();
~CEventLoopManager();

void enterLoop(wl_display* display, wl_event_loop* wlEventLoop);

Expand All @@ -24,8 +25,9 @@ class CEventLoopManager {

private:
struct {
wl_event_loop* loop = nullptr;
wl_display* display = nullptr;
wl_event_loop* loop = nullptr;
wl_display* display = nullptr;
wl_event_source* eventSource = nullptr;
} m_sWayland;

struct {
Expand Down
11 changes: 11 additions & 0 deletions src/xwayland/XWM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,17 @@ CXWM::CXWM() {
xcb_flush(connection);
}

CXWM::~CXWM() {
if (errors)
xcb_errors_context_free(errors);

if (connection)
xcb_disconnect(connection);

if (eventSource)
wl_event_source_remove(eventSource);
}

void CXWM::setActiveWindow(xcb_window_t window) {
xcb_change_property(connection, XCB_PROP_MODE_REPLACE, screen->root, HYPRATOMS["_NET_ACTIVE_WINDOW"], HYPRATOMS["WINDOW"], 32, 1, &window);
}
Expand Down
1 change: 1 addition & 0 deletions src/xwayland/XWM.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ struct SXSelection {
class CXWM {
public:
CXWM();
~CXWM();

int onEvent(int fd, uint32_t mask);

Expand Down
Loading