Merge branch 'next' into master

[i3/i3] / src / load_layout.c

diff --git a/src/load_layout.c b/src/load_layout.c
index aa7ac03c452f20c66505215602be441cc61ae3bd..5a340d2c6c28bfc1befb96829a9276172dcd3b74 100644 (file)
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -108,18 +108,11 @@ static int json_end_map(void *ctx) {
             /* Prevent name clashes when appending a workspace, e.g. when the
              * user tries to restore a workspace called “1” but already has a
              * workspace called “1”. */
             /* Prevent name clashes when appending a workspace, e.g. when the
              * user tries to restore a workspace called “1” but already has a
              * workspace called “1”. */

-            Con *output;
-            Con *workspace = NULL;
-            TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
-            GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, json_node->name));

             char *base = sstrdup(json_node->name);
             int cnt = 1;
             char *base = sstrdup(json_node->name);
             int cnt = 1;

-            while (workspace != NULL) {
+            while (get_existing_workspace_by_name(json_node->name) != NULL) {

                 FREE(json_node->name);
                 sasprintf(&(json_node->name), "%s_%d", base, cnt++);
                 FREE(json_node->name);
                 sasprintf(&(json_node->name), "%s_%d", base, cnt++);

-                workspace = NULL;
-                TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
-                GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, json_node->name));

             }
             free(base);
 
             }
             free(base);
 


@@ -160,8 +153,7 @@ static int json_end_map(void *ctx) {
                 free(marks[i]);
             }
 
                 free(marks[i]);
             }
 

-            free(marks);
-            marks = NULL;
+            FREE(marks);

             num_marks = 0;
         }
 
             num_marks = 0;
         }
 


@@ -618,6 +610,17 @@ void tree_append_json(Con *con, const char *buf, const size_t len, char **errorm
     yajl_config(hand, yajl_allow_comments, true);
     /* Allow multiple values, i.e. multiple nodes to attach */
     yajl_config(hand, yajl_allow_multiple_values, true);
     yajl_config(hand, yajl_allow_comments, true);
     /* Allow multiple values, i.e. multiple nodes to attach */
     yajl_config(hand, yajl_allow_multiple_values, true);

+    /* We don't need to validate that the input is valid UTF8 here.
+     * tree_append_json is called in two cases:
+     * 1. With the append_layout command. json_validate is called first and will
+     *    fail on invalid UTF8 characters so we don't need to recheck.
+     * 2. With an in-place restart. The rest of the codebase should be
+     *    responsible for producing valid UTF8 JSON output. If not,
+     *    tree_append_json will just preserve invalid UTF8 strings in the tree
+     *    instead of failing to parse the layout file which could lead to
+     *    problems like in #3156.
+     * Either way, disabling UTF8 validation slightly speeds up yajl. */
+    yajl_config(hand, yajl_dont_validate_strings, true);

     json_node = con;
     to_focus = NULL;
     incomplete = 0;
     json_node = con;
     to_focus = NULL;
     incomplete = 0;


@@ -639,6 +642,9 @@ void tree_append_json(Con *con, const char *buf, const size_t len, char **errorm
         while (incomplete-- > 0) {
             Con *parent = json_node->parent;
             DLOG("freeing incomplete container %p\n", json_node);
         while (incomplete-- > 0) {
             Con *parent = json_node->parent;
             DLOG("freeing incomplete container %p\n", json_node);

+            if (json_node == to_focus) {
+                to_focus = NULL;
+            }

             con_free(json_node);
             json_node = parent;
         }
             con_free(json_node);
             json_node = parent;
         }