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

fix: handle NULL from json_tokener_new_ex

Browse source 
if there is not enough memory to fit json_tokener and (depth *
json_tokener_srec) in RAM, don't segfault.
This commit is contained in:
Sefa Eyeoglu 2021-10-21 18:20:26 +02:00 committed by Simon Ser
parent 21d2fdf74c
commit 944d7031c5
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
swaymsg/main.c
View file

@ -482,28 +482,33 @@ int main(int argc, char **argv) {
// pretty print the json // pretty print the json
json_tokener *tok = json_tokener_new_ex(INT_MAX); json_tokener *tok = json_tokener_new_ex(INT_MAX);
json_object *obj = json_tokener_parse_ex(tok, resp, -1); if (tok == NULL) {
enum json_tokener_error err = json_tokener_get_error(tok); sway_log(SWAY_ERROR, "failed allocating json_tokener");
json_tokener_free(tok);
if (obj == NULL || err != json_tokener_success) {
if (!quiet) {
sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
json_tokener_error_desc(err));
}
ret = 1; ret = 1;
} else { } else {
if (!success(obj, true)) { json_object *obj = json_tokener_parse_ex(tok, resp, -1);
ret = 2; enum json_tokener_error err = json_tokener_get_error(tok);
} json_tokener_free(tok);
if (!quiet && (type != IPC_SUBSCRIBE || ret != 0)) { if (obj == NULL || err != json_tokener_success) {
if (raw) { if (!quiet) {
printf("%s\n", json_object_to_json_string_ext(obj, sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED)); json_tokener_error_desc(err));
} else {
pretty_print(type, obj);
} }
ret = 1;
} else {
if (!success(obj, true)) {
ret = 2;
}
if (!quiet && (type != IPC_SUBSCRIBE || ret != 0)) {
if (raw) {
printf("%s\n", json_object_to_json_string_ext(obj,
JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
} else {
pretty_print(type, obj);
}
}
json_object_put(obj);
} }
json_object_put(obj);
} }
free(command); free(command);
free(resp); free(resp);
@ -521,6 +526,11 @@ int main(int argc, char **argv) {
} }
json_tokener *tok = json_tokener_new_ex(INT_MAX); json_tokener *tok = json_tokener_new_ex(INT_MAX);
if (tok == NULL) {
sway_log(SWAY_ERROR, "failed allocating json_tokener");
ret = 1;
break;
}
json_object *obj = json_tokener_parse_ex(tok, reply->payload, -1); json_object *obj = json_tokener_parse_ex(tok, reply->payload, -1);
enum json_tokener_error err = json_tokener_get_error(tok); enum json_tokener_error err = json_tokener_get_error(tok);
json_tokener_free(tok); json_tokener_free(tok);