Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-27 21:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaymsg: be explicit about the json parser error

Browse source
This commit is contained in:
Jason Nader 2021-10-18 18:44:41 +09:00 committed by Simon Ser
parent f873bcc4e1
commit 55cd8abd76
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
swaymsg/main.c
View file

@ -483,12 +483,12 @@ int main(int argc, char **argv) {
// pretty print the json
json_tokener *tok = json_tokener_new_ex(INT_MAX);
json_object *obj = json_tokener_parse_ex(tok, resp, -1);
enum json_tokener_error err = json_tokener_get_error(tok);
json_tokener_free(tok);
if (obj == NULL) {
if (obj == NULL || err != json_tokener_success) {
if (!quiet) {
fprintf(stderr, "ERROR: Could not parse json response from ipc. "
"This is a bug in sway.");
printf("%s\n", resp);
sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
json_tokener_error_desc(err));
}
ret = 1;
} else {
@ -522,11 +522,12 @@ int main(int argc, char **argv) {
json_tokener *tok = json_tokener_new_ex(INT_MAX);
json_object *obj = json_tokener_parse_ex(tok, reply->payload, -1);
enum json_tokener_error err = json_tokener_get_error(tok);
json_tokener_free(tok);
if (obj == NULL) {
if (obj == NULL || err != json_tokener_success) {
if (!quiet) {
fprintf(stderr, "ERROR: Could not parse json response from"
" ipc. This is a bug in sway.");
sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
json_tokener_error_desc(err));
ret = 1;
}
break;