From 13372d511aa926c018161a4d7287e9b9ce6ea9c3 Mon Sep 17 00:00:00 2001
From: Chih-Chyuan Hwang <hwangcc@csie.nctu.edu.tw>
Date: Tue, 23 May 2017 14:47:11 +0800
Subject: [PATCH] Fix the i3 crash caused by mark + restart commands (#2779)

This patch fixes the issue #2511(https://github.com/i3/i3/issues/2511).

1). Memorize the marks, but only call con_mark once the container has finished parsing. (Credit: This is @Airblader's patch.)

2). Add a test case 267-regress-mark-restart.t for regression test to check if mark and restart command crash i3.
---
 src/load_layout.c                      | 19 ++++++++++++++--
 testcases/t/267-regress-mark-restart.t | 30 ++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 testcases/t/267-regress-mark-restart.t

diff --git a/src/load_layout.c b/src/load_layout.c
index f6f045d2..632c6ec7 100644
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -29,6 +29,8 @@ static bool parsing_focus;
 static bool parsing_marks;
 struct Match *current_swallow;
 static bool swallow_is_empty;
+static int num_marks;
+static char **marks;
 
 /* This list is used for reordering the focus stack after parsing the 'focus'
  * array. */
@@ -148,6 +150,16 @@ static int json_end_map(void *ctx) {
             floating_check_size(json_node);
         }
 
+        if (num_marks > 0) {
+            for (int i = 0; i < num_marks; i++) {
+                con_mark(json_node, marks[i], MM_ADD);
+                free(marks[i]);
+            }
+
+            free(marks);
+            num_marks = 0;
+        }
+
         LOG("attaching\n");
         con_attach(json_node, json_node->parent, true);
         LOG("Creating window\n");
@@ -230,8 +242,10 @@ static int json_key(void *ctx, const unsigned char *val, size_t len) {
     if (strcasecmp(last_key, "focus") == 0)
         parsing_focus = true;
 
-    if (strcasecmp(last_key, "marks") == 0)
+    if (strcasecmp(last_key, "marks") == 0) {
+        num_marks = 0;
         parsing_marks = true;
+    }
 
     return 1;
 }
@@ -261,7 +275,8 @@ static int json_string(void *ctx, const unsigned char *val, size_t len) {
         char *mark;
         sasprintf(&mark, "%.*s", (int)len, val);
 
-        con_mark(json_node, mark, MM_ADD);
+        marks = srealloc(marks, (++num_marks) * sizeof(char *));
+        marks[num_marks - 1] = sstrdup(mark);
     } else {
         if (strcasecmp(last_key, "name") == 0) {
             json_node->name = scalloc(len + 1, 1);
diff --git a/testcases/t/267-regress-mark-restart.t b/testcases/t/267-regress-mark-restart.t
new file mode 100644
index 00000000..220d765b
--- /dev/null
+++ b/testcases/t/267-regress-mark-restart.t
@@ -0,0 +1,30 @@
+#!perl
+# vim:ts=4:sw=4:expandtab
+#
+# Please read the following documents before working on tests:
+# • http://build.i3wm.org/docs/testsuite.html
+#   (or docs/testsuite)
+#
+# • http://build.i3wm.org/docs/lib-i3test.html
+#   (alternatively: perldoc ./testcases/lib/i3test.pm)
+#
+# • http://build.i3wm.org/docs/ipc.html
+#   (or docs/ipc)
+#
+# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
+#   (unless you are already familiar with Perl)
+#
+# Regression test to check if mark and restart commands crash i3
+#
+use i3test;
+
+cmd 'open';
+cmd 'mark foo';
+
+cmd 'restart';
+
+diag('Checking if i3 still lives');
+
+does_i3_live;
+
+done_testing;
-- 
2.39.2