nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3391 from orestisf1993/yajl-utf8 

tree_append_json: Allow strings that are not valid UTF8
This commit is contained in:
Ingo Bürk 2018-09-06 14:15:54 +02:00 committed by GitHub
parent cb6da7169a be6faa3161
commit 9dc4df81ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/load_layout.c
View File

@ -611,6 +611,10 @@ void tree_append_json(Con *con, const char *buf, const size_t len, char **errorm
yajl_config(hand, yajl_allow_comments, true); yajl_config(hand, yajl_allow_comments, true);
/* Allow multiple values, i.e. multiple nodes to attach */ /* Allow multiple values, i.e. multiple nodes to attach */
yajl_config(hand, yajl_allow_multiple_values, true); yajl_config(hand, yajl_allow_multiple_values, true);
/* Allow strings that are not valid UTF8. Could be possible if a container
* name contains such characters. If yajl stops parsing because of this, an
* in-place restart could fail: see #3156. */
yajl_config(hand, yajl_dont_validate_strings, true);
json_node = con; json_node = con;
to_focus = NULL; to_focus = NULL;
incomplete = 0; incomplete = 0;
@ -632,6 +636,9 @@ void tree_append_json(Con *con, const char *buf, const size_t len, char **errorm
while (incomplete-- > 0) { while (incomplete-- > 0) {
Con *parent = json_node->parent; Con *parent = json_node->parent;
DLOG("freeing incomplete container %p\n", json_node); DLOG("freeing incomplete container %p\n", json_node);
if (json_node == to_focus) {
to_focus = NULL;
}
con_free(json_node); con_free(json_node);
json_node = parent; json_node = parent;
} }