From ac11771348146087eb577d20162ec10a81358a7e Mon Sep 17 00:00:00 2001
From: Tom Englund <tomenglund26@gmail.com>
Date: Fri, 28 Jun 2024 22:24:32 +0200
Subject: [PATCH] core: fix a few ubsan issues reported at exit of hyprland
 (#6699)

* 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.
---
 src/helpers/Watchdog.cpp    | 6 +++---
 src/render/Renderbuffer.cpp | 2 +-
 src/render/Texture.cpp      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/helpers/Watchdog.cpp b/src/helpers/Watchdog.cpp
index afb8a946..b9f654da 100644
--- a/src/helpers/Watchdog.cpp
+++ b/src/helpers/Watchdog.cpp
@@ -7,7 +7,9 @@ CWatchdog::~CWatchdog() {
     m_bExitThread = true;
     m_bNotified   = true;
     m_cvWatchdogCondition.notify_all();
-    m_pWatchdog.reset();
+
+    if (m_pWatchdog && m_pWatchdog->joinable())
+        m_pWatchdog->join();
 }
 
 CWatchdog::CWatchdog() {
@@ -33,8 +35,6 @@ CWatchdog::CWatchdog() {
             m_bNotified = false;
         }
     });
-
-    m_pWatchdog->detach();
 }
 
 void CWatchdog::startWatching() {
diff --git a/src/render/Renderbuffer.cpp b/src/render/Renderbuffer.cpp
index 694485c2..b55a921b 100644
--- a/src/render/Renderbuffer.cpp
+++ b/src/render/Renderbuffer.cpp
@@ -6,7 +6,7 @@
 #include <dlfcn.h>
 
 CRenderbuffer::~CRenderbuffer() {
-    if (!g_pCompositor)
+    if (!g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
         return;
 
     g_pHyprRenderer->makeEGLCurrent();
diff --git a/src/render/Texture.cpp b/src/render/Texture.cpp
index 5560db97..46c501a0 100644
--- a/src/render/Texture.cpp
+++ b/src/render/Texture.cpp
@@ -9,7 +9,7 @@ CTexture::CTexture() {
 }
 
 CTexture::~CTexture() {
-    if (m_bNonOwning)
+    if (m_bNonOwning || !g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
         return;
 
     g_pHyprRenderer->makeEGLCurrent();