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

swaybar: add NULL check when listing workspaces

Browse source 
For some reason my version of sway doesn't show workspace names:

    $ swaymsg -t get_outputs
    Output HDMI-A-1 '(null) (null) (null)' (inactive)
    Output HDMI-A-2 '(null) (null) (null)' (inactive)

Which is weird, but it's no reason to crash swaybar. The field is
totally missing from the JSON, so it ends up doing strcmp(NULL, name)
which is undefined behavior.
This commit is contained in:
Milkey Mouse 2020-05-20 13:57:56 -07:00 committed by Simon Ser
parent 2bf14cb747
commit 45e4e92172
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
swaybar/ipc.c
View file

@ -360,7 +360,7 @@ bool ipc_get_workspaces(struct swaybar *bar) {
wl_list_for_each(output, &bar->outputs, link) { wl_list_for_each(output, &bar->outputs, link) {
const char *ws_output = json_object_get_string(out); const char *ws_output = json_object_get_string(out);
if (strcmp(ws_output, output->name) == 0) { if (ws_output != NULL && strcmp(ws_output, output->name) == 0) {
struct swaybar_workspace *ws = struct swaybar_workspace *ws =
calloc(1, sizeof(struct swaybar_workspace)); calloc(1, sizeof(struct swaybar_workspace));
ws->num = json_object_get_int(num); ws->num = json_object_get_int(num);