alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix name validation in sni_watcher.c

Browse source 
This commit also fixes a memory leak that occurs on failure.
This commit is contained in:
Calvin Lee 2017-07-13 20:24:33 -07:00
parent e33792e80a
commit 5ceb52962e
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
swaybar/tray/sni_watcher.c
View file

@ -150,10 +150,14 @@ static void register_item(DBusConnection *connection, DBusMessage *message) {
sway_log(L_ERROR, "Error parsing method args: %s\n", error.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); sway_log(L_INFO, "RegisterStatusNotifierItem called with \"%s\"\n", name);
// Don't add duplicate or not real item // 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) { if (list_seq_find(items, (int (*)(const void *, const void *))strcmp, name) != -1) {
return; return;
} }
@ -161,7 +165,7 @@ static void register_item(DBusConnection *connection, DBusMessage *message) {
return; return;
} }
list_add(items, name); list_add(items, strdup(name));
item_registered_signal(connection, name); item_registered_signal(connection, name);
// It's silly, but xembedsniproxy wants a reply for this function // 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); sway_log(L_INFO, "RegisterStatusNotifierHost called with \"%s\"\n", name);
// Don't add duplicate or not real host // 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) { if (list_seq_find(hosts, (int (*)(const void *, const void *))strcmp, name) != -1) {
return; return;
} }