koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

validate JSON before loading

Browse Source 
This commit also introduces slurp() which reads a file in its entirety. Using
this function instead of doing IO in the functions in load_layout.c again and
again makes the code cleaner (fixing at least two memory leaks) and avoids
re-reading the same file 3 times.

related to #2755
This commit is contained in:
Michael Stapelberg
2017-09-13 17:14:51 +02:00
parent 72c972a36c
commit c45c002bad
6 changed files with 131 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/commands.c
View File

@ -773,13 +773,25 @@ void cmd_append_layout(I3_CMD, const char *cpath) {
/* Make sure we allow paths like '~/.i3/layout.json' */
path = resolve_tilde(path);
json_content_t content = json_determine_content(path);
char *buf = NULL;
ssize_t len;
if ((len = slurp(path, &buf)) < 0) {
/* slurp already logged an error. */
goto out;
}
if (!json_validate(buf, len)) {
ELOG("Could not parse \"%s\" as JSON, not loading.\n", path);
yerror("Could not parse \"%s\" as JSON.", path);
goto out;
}
json_content_t content = json_determine_content(buf, len);
LOG("JSON content = %d\n", content);
if (content == JSON_CONTENT_UNKNOWN) {
ELOG("Could not determine the contents of \"%s\", not loading.\n", path);
yerror("Could not determine the contents of \"%s\".", path);
free(path);
return;
goto out;
}
Con *parent = focused;
@ -795,7 +807,7 @@ void cmd_append_layout(I3_CMD, const char *cpath) {
}
DLOG("Appending to parent=%p instead of focused=%p\n", parent, focused);
char *errormsg = NULL;
tree_append_json(parent, path, &errormsg);
tree_append_json(parent, buf, len, &errormsg);
if (errormsg != NULL) {
yerror(errormsg);
free(errormsg);
@ -820,8 +832,10 @@ void cmd_append_layout(I3_CMD, const char *cpath) {
if (content == JSON_CONTENT_WORKSPACE)
ipc_send_workspace_event("restored", parent, NULL);
free(path);
cmd_output->needs_tree_render = true;
out:
free(path);
free(buf);
}
/*