mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-05 16:26:00 +01:00
ac11771348
* watchdog: dont detach and cause race condition instead of detaching and causing a race condition on destruction where the thread is alive and watchdog has been destroyed, check if its joinable and join it on destruction. causes heap use after free on exit of compositor. * render: add checks for compositor shutting down avoid member call on null pointer, if the g_pHyprRenderer is destroyed we can call the member makeEGLCurrent on it, causes undefined behaviour on destruction of the compositor/hyprrenderer. found with ubsan.
60 lines
No EOL
1.6 KiB
C++
60 lines
No EOL
1.6 KiB
C++
#include "Watchdog.hpp"
|
|
#include <signal.h>
|
|
#include "config/ConfigManager.hpp"
|
|
#include "../config/ConfigValue.hpp"
|
|
|
|
CWatchdog::~CWatchdog() {
|
|
m_bExitThread = true;
|
|
m_bNotified = true;
|
|
m_cvWatchdogCondition.notify_all();
|
|
|
|
if (m_pWatchdog && m_pWatchdog->joinable())
|
|
m_pWatchdog->join();
|
|
}
|
|
|
|
CWatchdog::CWatchdog() {
|
|
m_iMainThreadPID = pthread_self();
|
|
|
|
m_pWatchdog = std::make_unique<std::thread>([this] {
|
|
static auto PTIMEOUT = CConfigValue<Hyprlang::INT>("debug:watchdog_timeout");
|
|
|
|
while (1337) {
|
|
std::unique_lock lk(m_mWatchdogMutex);
|
|
|
|
if (!m_bWillWatch)
|
|
m_cvWatchdogCondition.wait(lk, [this] { return m_bNotified; });
|
|
else {
|
|
if (m_cvWatchdogCondition.wait_for(lk, std::chrono::milliseconds((int)(*PTIMEOUT * 1000.0)), [this] { return m_bNotified; }) == false)
|
|
pthread_kill(m_iMainThreadPID, SIGUSR1);
|
|
}
|
|
|
|
if (m_bExitThread)
|
|
break;
|
|
|
|
m_bWatching = false;
|
|
m_bNotified = false;
|
|
}
|
|
});
|
|
}
|
|
|
|
void CWatchdog::startWatching() {
|
|
static auto PTIMEOUT = CConfigValue<Hyprlang::INT>("debug:watchdog_timeout");
|
|
|
|
if (*PTIMEOUT == 0)
|
|
return;
|
|
|
|
m_tTriggered = std::chrono::high_resolution_clock::now();
|
|
m_bWillWatch = true;
|
|
m_bWatching = true;
|
|
|
|
m_bNotified = true;
|
|
m_cvWatchdogCondition.notify_all();
|
|
}
|
|
|
|
void CWatchdog::endWatching() {
|
|
m_bWatching = false;
|
|
m_bWillWatch = false;
|
|
|
|
m_bNotified = true;
|
|
m_cvWatchdogCondition.notify_all();
|
|
} |