From cd49eef22956fb11e5f1ddd2a4d8e629c274f903 Mon Sep 17 00:00:00 2001
From: Yifei Teng <yifeit@google.com>
Date: Fri, 30 Jun 2023 23:25:24 -0700
Subject: [PATCH] Partially revert 3af1853260 to fix use-after-free

After upgrading to the latest release of Waybar the bar will crash
whenever I close the laptop lid. After some debugging I believe it is
because the watching added by watch_name is not being correctly canceled
using unwatch_name. After the Tray object and Host object are destroyed,
additional callbacks will become use-after-free.

Looks like commit 3af1853260dafc43c992fc2357a3f3bace3bccaa removed the
unwatch_name. I'm not sure why it did that, but it seemed dangerous.

Additionally, bus_name_id_ is created by own_name. According to that
function's documentation, the correct inverse operation is unown_name.
---
 src/modules/sni/host.cpp    | 6 +++++-
 src/modules/sni/watcher.cpp | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp
index fff8e019..0bbd4d2f 100644
--- a/src/modules/sni/host.cpp
+++ b/src/modules/sni/host.cpp
@@ -19,9 +19,13 @@ Host::Host(const std::size_t id, const Json::Value& config, const Bar& bar,
 
 Host::~Host() {
   if (bus_name_id_ > 0) {
-    Gio::DBus::unwatch_name(bus_name_id_);
+    Gio::DBus::unown_name(bus_name_id_);
     bus_name_id_ = 0;
   }
+  if (watcher_id_ > 0) {
+    Gio::DBus::unwatch_name(watcher_id_);
+    watcher_id_ = 0;
+  }
   g_cancellable_cancel(cancellable_);
   g_clear_object(&cancellable_);
   g_clear_object(&watcher_);
diff --git a/src/modules/sni/watcher.cpp b/src/modules/sni/watcher.cpp
index 663fdcdc..dfd076ef 100644
--- a/src/modules/sni/watcher.cpp
+++ b/src/modules/sni/watcher.cpp
@@ -14,6 +14,10 @@ Watcher::Watcher()
       watcher_(sn_watcher_skeleton_new()) {}
 
 Watcher::~Watcher() {
+  if (hosts_ != nullptr) {
+    g_slist_free_full(hosts_, gfWatchFree);
+    hosts_ = nullptr;
+  }
   if (items_ != nullptr) {
     g_slist_free_full(items_, gfWatchFree);
     items_ = nullptr;