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

22
src/helpers/MonitorFrameScheduler.cpp
View file

@ -36,7 +36,16 @@ void CMonitorFrameScheduler::onSyncFired() {
m_renderAtFrame = false; // block frame rendering, we already scheduled
m_lastRenderBegun = hrc::now();
// get a ref to ourselves. renderMonitor can destroy this scheduler if it decides to perform a monitor reload
// FIXME: this is horrible. "renderMonitor" should not be able to do that.
auto self = m_self;
g_pHyprRenderer->renderMonitor(m_monitor.lock(), false);
if (!self)
return;
onFinishRender();
}
@ -99,14 +108,23 @@ void CMonitorFrameScheduler::onFrame() {
Debug::log(TRACE, "CMonitorFrameScheduler: {} -> frame event, render = true, rendering normally.", m_monitor->m_name);
m_lastRenderBegun = hrc::now();
// get a ref to ourselves. renderMonitor can destroy this scheduler if it decides to perform a monitor reload
// FIXME: this is horrible. "renderMonitor" should not be able to do that.
auto self = m_self;
g_pHyprRenderer->renderMonitor(m_monitor.lock());
if (!self)
return;
onFinishRender();
}
void CMonitorFrameScheduler::onFinishRender() {
m_sync = CEGLSync::create(); // this destroys the old sync
g_pEventLoopManager->doOnReadable(m_sync->fd().duplicate(), [this, mon = m_monitor] {
if (!mon) // might've gotten destroyed
g_pEventLoopManager->doOnReadable(m_sync->fd().duplicate(), [this, self = m_self] {
if (!self) // might've gotten destroyed
return;
onSyncFired();
});