From 6383c4d91c7a71492556046c603eea1704ae7b8d Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 22 Oct 2017 19:50:43 -0400 Subject: Merge pull request #1424 from ggreer/swaygrab-json swaygrab: Prevent segfault if IPC response can't be parsed. --- swaygrab/json.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/swaygrab/json.c b/swaygrab/json.c index 80dae299..32b68612 100644 --- a/swaygrab/json.c +++ b/swaygrab/json.c @@ -4,6 +4,7 @@ #include #include #include +#include "log.h" #include "ipc-client.h" #include "swaygrab/json.h" @@ -12,7 +13,15 @@ static json_object *tree; void init_json_tree(int socketfd) { uint32_t len = 0; char *res = ipc_single_command(socketfd, IPC_GET_TREE, NULL, &len); - tree = json_tokener_parse(res); + struct json_tokener *tok = json_tokener_new_ex(256); + if (!tok) { + sway_abort("Unable to get json tokener."); + } + tree = json_tokener_parse_ex(tok, res, len); + if (!tree || tok->err != json_tokener_success) { + sway_abort("Unable to parse IPC response as JSON: %s", json_tokener_error_desc(tok->err)); + } + json_tokener_free(tok); } void free_json_tree() { -- cgit v1.2.3-54-g00ecf