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

swaybar: explicitly check return value of getdelim

Browse source 
This prevents an signed-to-unsigned conversion error on buffer_index if
getdelim fails and returns -1, which caused swaybar to try to search the
header for the array and immediately failing
This commit is contained in:
Ian Fan 2018-09-22 10:57:22 +01:00
parent b148da848a
commit a4d346627c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
swaybar/status_line.c
View file

@ -67,9 +67,13 @@ bool status_handle_readable(struct status_line *status) {
wl_list_init(&status->blocks);
status->tokener = json_tokener_new();
status->buffer_index = getdelim(&status->buffer,
&status->buffer_size, EOF, status->read);
return i3bar_handle_readable(status);
read_bytes = getdelim(&status->buffer, &status->buffer_size, EOF, status->read);
if (read_bytes > 0) {
status->buffer_index = read_bytes;
return i3bar_handle_readable(status);
} else {
return false;
}
}
wlr_log(WLR_DEBUG, "Using text protocol.");