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

swaybar: reset tokener if json is incomplete

Browse source 
If the tokener parses incomplete json, it sets its error value to
json_tokener_continue. This means that extra json should be provided,
but the code was providing the entire object again. In the interest of
simplicity, the tokener is reset so that buffer_pos always points to the
start of the current object.
This commit is contained in:
Ian Fan 2018-09-21 14:59:01 +01:00
parent dbda5d35eb
commit ccdec2a329
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
swaybar/i3bar.c
View file

@ -199,6 +199,7 @@ bool i3bar_handle_readable(struct status_line *status) {
} }
buffer_pos = status->buffer_index = 0; buffer_pos = status->buffer_index = 0;
} else if (json_tokener_get_error(status->tokener) == json_tokener_continue) { } else if (json_tokener_get_error(status->tokener) == json_tokener_continue) {
json_tokener_reset(status->tokener);
if (status->buffer_index < status->buffer_size) { if (status->buffer_index < status->buffer_size) {
// move the object to the start of the buffer // move the object to the start of the buffer
status->buffer_index -= buffer_pos; status->buffer_index -= buffer_pos;