diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-09-22 20:10:58 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-22 20:10:58 +1000 |
commit | 480bcda1ee244af49fd826a58fb5ad3fba86444a (patch) | |
tree | 9fe3ee50c17a53266183e1e4643bb149c6af6c86 /swaybar | |
parent | Merge pull request #2679 from RyanDwyer/fix-pango-escaping (diff) | |
parent | swaybar: explicitly check return value of getdelim (diff) | |
download | sway-480bcda1ee244af49fd826a58fb5ad3fba86444a.tar.gz sway-480bcda1ee244af49fd826a58fb5ad3fba86444a.tar.zst sway-480bcda1ee244af49fd826a58fb5ad3fba86444a.zip |
Merge pull request #2687 from ianyfan/swaybar
swaybar: explicitly check return value of getdelim
Diffstat (limited to 'swaybar')
-rw-r--r-- | swaybar/status_line.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/swaybar/status_line.c b/swaybar/status_line.c index 401bf6f6..48b43248 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c | |||
@@ -67,9 +67,13 @@ bool status_handle_readable(struct status_line *status) { | |||
67 | 67 | ||
68 | wl_list_init(&status->blocks); | 68 | wl_list_init(&status->blocks); |
69 | status->tokener = json_tokener_new(); | 69 | status->tokener = json_tokener_new(); |
70 | status->buffer_index = getdelim(&status->buffer, | 70 | read_bytes = getdelim(&status->buffer, &status->buffer_size, EOF, status->read); |
71 | &status->buffer_size, EOF, status->read); | 71 | if (read_bytes > 0) { |
72 | return i3bar_handle_readable(status); | 72 | status->buffer_index = read_bytes; |
73 | return i3bar_handle_readable(status); | ||
74 | } else { | ||
75 | return false; | ||
76 | } | ||
73 | } | 77 | } |
74 | 78 | ||
75 | wlr_log(WLR_DEBUG, "Using text protocol."); | 79 | wlr_log(WLR_DEBUG, "Using text protocol."); |