From 53233e47a313773dab278879ce6cf9866ea9ed22 Mon Sep 17 00:00:00 2001
From: dpayne <darby.payne@gmail.com>
Date: Sun, 21 Jan 2024 19:08:23 -0800
Subject: [PATCH 1/2] Fix use after free on task close

---
 src/modules/wlr/taskbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
index 9a8b89e7..0eaf264a 100644
--- a/src/modules/wlr/taskbar.cpp
+++ b/src/modules/wlr/taskbar.cpp
@@ -527,11 +527,11 @@ void Task::handle_closed() {
   spdlog::debug("{} closed", repr());
   zwlr_foreign_toplevel_handle_v1_destroy(handle_);
   handle_ = nullptr;
-  tbar_->remove_task(id_);
   if (button_visible_) {
     tbar_->remove_button(button);
     button_visible_ = false;
   }
+  tbar_->remove_task(id_);
 }
 
 bool Task::handle_clicked(GdkEventButton *bt) {

From 82b632e4ec1489f9b4446b8c8df6f0a8c59efe3f Mon Sep 17 00:00:00 2001
From: SquishyPandaDev <55671441+SquishyPandaDev@users.noreply.github.com>
Date: Mon, 22 Jan 2024 03:22:19 -0500
Subject: [PATCH 2/2] Fix module UPower display device poniter

Force displayDevice to be a nullptr on class setup
---
 include/modules/upower/upower.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/modules/upower/upower.hpp b/include/modules/upower/upower.hpp
index eda8ab05..d763259b 100644
--- a/include/modules/upower/upower.hpp
+++ b/include/modules/upower/upower.hpp
@@ -66,7 +66,7 @@ class UPower : public AModule {
   Devices devices;
   std::mutex m_Mutex;
   UpClient *client;
-  UpDevice *displayDevice;
+  UpDevice *displayDevice = nullptr;
   guint login1_id;
   GDBusConnection *login1_connection;
   std::unique_ptr<UPowerTooltip> upower_tooltip;