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

framescheduler: fix edge case crashes

Browse source 
rare UAFs because renderMonitor can call onDisconnect (ugh, that should be changed...)

fixes #11073
This commit is contained in:
vaxerski 2025-08-16 16:52:28 +02:00
parent 1cbb62ed6a
commit 78c9e2080c
3 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/helpers/Monitor.cpp
View file

@ -63,7 +63,10 @@ void CMonitor::onConnect(bool noRule) {
g_pEventLoopManager->doLater([] { g_pConfigManager->ensurePersistentWorkspacesPresent(); });
m_listeners.frame = m_output->events.frame.listen([this] { m_frameScheduler->onFrame(); });
m_listeners.frame = m_output->events.frame.listen([this] {
if (m_frameScheduler)
m_frameScheduler->onFrame();
});
m_listeners.commit = m_output->events.commit.listen([this] {
if (true) { // FIXME: E->state->committed & WLR_OUTPUT_STATE_BUFFER
PROTO::screencopy->onOutputCommit(m_self.lock());
@ -127,7 +130,8 @@ void CMonitor::onConnect(bool noRule) {
applyMonitorRule(&rule);
});
m_frameScheduler = makeUnique<CMonitorFrameScheduler>(m_self.lock());
m_frameScheduler = makeUnique<CMonitorFrameScheduler>(m_self.lock());
m_frameScheduler->m_self = WP<CMonitorFrameScheduler>(m_frameScheduler);
m_tearingState.canTear = m_output->getBackend()->type() == Aquamarine::AQ_BACKEND_DRM;