sway

commit e33792e80a095b8619951e8c9c4fa0d16aa4c495
parent 13ed84e8865c02b808444202e6e347d870c5d0e9
Author: Drew DeVault <sir@cmpwn.com>
Date:   Thu, 13 Jul 2017 10:53:54 -0400

Merge pull request #1276 from 4e554c4c/bad_items

Don't trust SNI names, fixes #1274
Diffstat:
M
include/swaybar/tray/sni.h
 | 
1
+
M
swaybar/tray/sni.c
 | 
6
++++++
M
swaybar/tray/tray.c
 | 
14
+++++++++-----

3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/include/swaybar/tray/sni.h b/include/swaybar/tray/sni.h
@@ -28,6 +28,7 @@ void sni_icon_ref_free(struct sni_icon_ref *sni_ref);
 
 /**
  * Will return a new item and get its icon. (see warning below)
+ * May return `NULL` if `name` is not valid.
  */
 struct StatusNotifierItem *sni_create(const char *name);
 
diff --git a/swaybar/tray/sni.c b/swaybar/tray/sni.c
@@ -413,6 +413,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/tray.c b/swaybar/tray/tray.c
@@ -90,9 +90,11 @@ 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:
@@ -141,8 +143,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;