]> git.sur5r.net Git - i3/i3/commit - src/load_layout.c
Fix the i3 crash caused by mark + restart commands (#2779)
authorChih-Chyuan Hwang <hwangcc@csie.nctu.edu.tw>
Tue, 23 May 2017 06:47:11 +0000 (14:47 +0800)
committerMichael Stapelberg <stapelberg@users.noreply.github.com>
Tue, 23 May 2017 06:47:11 +0000 (08:47 +0200)
commit13372d511aa926c018161a4d7287e9b9ce6ea9c3
tree0c2a78d695f9bcfcc552b02e01fe0fccf1593d87
parent990100317ae6bb872921ef98a4a3baa6c7c43a4a
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
testcases/t/267-regress-mark-restart.t [new file with mode: 0644]