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

Bugfix: free incomplete containers when JSON parsing fails

Browse Source 
related to #2755
This commit is contained in:
Michael Stapelberg
2017-09-13 16:39:13 +02:00
parent 17627a5861
commit b23e1f644f
5 changed files with 135 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tree.c
View File

@ -320,22 +320,7 @@ bool tree_close_internal(Con *con, kill_window_t kill_window, bool dont_kill_par
DLOG("parent container killed\n");
}
free(con->name);
FREE(con->deco_render_params);
TAILQ_REMOVE(&all_cons, con, all_cons);
while (!TAILQ_EMPTY(&(con->swallow_head))) {
Match *match = TAILQ_FIRST(&(con->swallow_head));
TAILQ_REMOVE(&(con->swallow_head), match, matches);
match_free(match);
free(match);
}
while (!TAILQ_EMPTY(&(con->marks_head))) {
mark_t *mark = TAILQ_FIRST(&(con->marks_head));
TAILQ_REMOVE(&(con->marks_head), mark, marks);
FREE(mark->name);
FREE(mark);
}
free(con);
con_free(con);
/* in the case of floating windows, we already focused another container
* when closing the parent, so we can exit now. */