5 files changed, 39 insertions, 12 deletions

diff --git a/swaybar/tray/dbus.c b/swaybar/tray/dbus.c
index 22531aa6..8e719fd9 100644
--- a/swaybar/tray/dbus.c
+++ b/swaybar/tray/dbus.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -108,7 +108,7 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *_data) {
 
 	timer_settime(*timer, 0, &time, NULL);
 
-	dbus_timeout_set_data(timeout, timer, free);
+	dbus_timeout_set_data(timeout, timer, NULL);
 
 	sway_log(L_DEBUG, "Adding DBus timeout. Interval: %ds %dms", interval_sec, interval_msec);
 	add_timer(*timer, dispatch_timeout, timeout);
@@ -121,6 +121,8 @@ static void remove_timeout(DBusTimeout *timeout, void *_data) {
 
 	if (timer) {
 		remove_timer(*timer);
+		timer_delete(*timer);
+		free(timer);
 	}
 }
 
@@ -136,7 +138,7 @@ static void dispatch_status(DBusConnection *connection, DBusDispatchStatus new_s
 /* Public functions below */
 
 void dispatch_dbus() {
-	if (!should_dispatch) {
+	if (!should_dispatch || !conn) {
 		return;
 	}
 
diff --git a/swaybar/tray/icon.c b/swaybar/tray/icon.c
index 1c69ba72..c146bf32 100644
--- a/swaybar/tray/icon.c
+++ b/swaybar/tray/icon.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
 #define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/swaybar/tray/sni.c b/swaybar/tray/sni.c
index 0c46d5c0..c9d00657 100644
--- a/swaybar/tray/sni.c
+++ b/swaybar/tray/sni.c
@@ -160,6 +160,7 @@ static void reply_icon(DBusPendingCall *pending, void *_data) {
 		dirty = true;
 
 		dbus_message_unref(reply);
+		dbus_pending_call_unref(pending);
 		return;
 	} else {
 		sway_log(L_ERROR, "Could not create image surface");
@@ -170,6 +171,7 @@ bail:
 	if (reply) {
 		dbus_message_unref(reply);
 	}
+	dbus_pending_call_unref(pending);
 	sway_log(L_ERROR, "Could not get icon from item");
 	return;
 }
@@ -266,6 +268,7 @@ static void reply_icon_name(DBusPendingCall *pending, void *_data) {
 		dirty = true;
 
 		dbus_message_unref(reply);
+		dbus_pending_call_unref(pending);
 		return;
 	}
 
@@ -273,6 +276,7 @@ bail:
 	if (reply) {
 		dbus_message_unref(reply);
 	}
+	dbus_pending_call_unref(pending);
 	// Now try the pixmap
 	send_icon_msg(item);
 	return;
@@ -413,6 +417,12 @@ static void get_unique_name(struct StatusNotifierItem *item) {
 }
 
 struct StatusNotifierItem *sni_create(const char *name) {
+	// Make sure `name` is well formed
+	if (!dbus_validate_bus_name(name, NULL)) {
+		sway_log(L_INFO, "Name (%s) is not a bus name. We cannot create an item.", name);
+		return NULL;
+	}
+
 	struct StatusNotifierItem *item = malloc(sizeof(struct StatusNotifierItem));
 	item->name = strdup(name);
 	item->unique_name = NULL;
diff --git a/swaybar/tray/sni_watcher.c b/swaybar/tray/sni_watcher.c
index 388e181d..86453e70 100644
--- a/swaybar/tray/sni_watcher.c
+++ b/swaybar/tray/sni_watcher.c
@@ -150,10 +150,14 @@ static void register_item(DBusConnection *connection, DBusMessage *message) {
 		sway_log(L_ERROR, "Error parsing method args: %s\n", error.message);
 	}
 
-	name = strdup(name);
 	sway_log(L_INFO, "RegisterStatusNotifierItem called with \"%s\"\n", name);
 
 	// Don't add duplicate or not real item
+	if (!dbus_validate_bus_name(name, NULL)) {
+		sway_log(L_INFO, "This item is not valid, we cannot keep track of it.");
+		return;
+	}
+
 	if (list_seq_find(items, (int (*)(const void *, const void *))strcmp, name) != -1) {
 		return;
 	}
@@ -161,7 +165,7 @@ static void register_item(DBusConnection *connection, DBusMessage *message) {
 		return;
 	}
 
-	list_add(items, name);
+	list_add(items, strdup(name));
 	item_registered_signal(connection, name);
 
 	// It's silly, but xembedsniproxy wants a reply for this function
@@ -184,6 +188,12 @@ static void register_host(DBusConnection *connection, DBusMessage *message) {
 	sway_log(L_INFO, "RegisterStatusNotifierHost called with \"%s\"\n", name);
 
 	// Don't add duplicate or not real host
+	if (!dbus_validate_bus_name(name, NULL)) {
+		sway_log(L_INFO, "This item is not valid, we cannot keep track of it.");
+		return;
+	}
+
+
 	if (list_seq_find(hosts, (int (*)(const void *, const void *))strcmp, name) != -1) {
 		return;
 	}
diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c
index 00f1a44f..91c3af06 100644
--- a/swaybar/tray/tray.c
+++ b/swaybar/tray/tray.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -90,13 +90,16 @@ static void get_items_reply(DBusPendingCall *pending, void *_data) {
 
 		struct StatusNotifierItem *item = sni_create(name);
 
-		sway_log(L_DEBUG, "Item registered with host: %s", name);
-		list_add(tray->items, item);
-		dirty = true;
+		if (item) {
+			sway_log(L_DEBUG, "Item registered with host: %s", name);
+			list_add(tray->items, item);
+			dirty = true;
+		}
 	}
 
 bail:
 	dbus_message_unref(reply);
+	dbus_pending_call_unref(pending);
 	return;
 }
 static void get_items() {
@@ -141,8 +144,10 @@ static DBusHandlerResult signal_handler(DBusConnection *connection,
 		if (list_seq_find(tray->items, sni_str_cmp, name) == -1) {
 			struct StatusNotifierItem *item = sni_create(name);
 
-			list_add(tray->items, item);
-			dirty = true;
+			if (item) {
+				list_add(tray->items, item);
+				dirty = true;
+			}
 		}
 
 		return DBUS_HANDLER_RESULT_HANDLED;