circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 14:16:18 +00:00
Code Issues Projects Releases Wiki Activity

Do not crash when freeing layout cell, reported by Jere Viikari.

Browse Source
This commit is contained in:
nicm
2026-05-24 08:40:43 +00:00
parent 3cfc96d4de
commit f047b3f8e7
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
layout-custom.c
View File

@@ -304,8 +304,7 @@ layout_parse(struct window *w, const char *layout, char **cause)
layout_print_cell(tiled_lc, __func__, 0);
/* Free the floating layout cell, no longer needed. */
if (floating_lc != NULL)
layout_free_cell(floating_lc);
layout_free_cell(floating_lc);
notify_window("window-layout-changed", w);

3
layout.c
View File

@@ -78,6 +78,9 @@ layout_free_cell(struct layout_cell *lc)
{
struct layout_cell *lcchild;
if (lc == NULL)
return;
switch (lc->type) {
case LAYOUT_LEFTRIGHT:
case LAYOUT_TOPBOTTOM:

2
screen-redraw.c
View File

@@ -1273,7 +1273,7 @@ screen_redraw_draw_pane(struct screen_redraw_ctx *ctx, struct window_pane *wp)
struct screen *s = wp->screen;
struct colour_palette *palette = &wp->palette;
struct grid_cell defaults;
u_int i, j, woy, wx, wy, px, py, width;
u_int i, j, woy, wx, wy, py, width;
struct visible_ranges *r;
struct visible_range *ri;

6
window.c
View File

@@ -349,10 +349,8 @@ window_destroy(struct window *w)
window_unzoom(w, 0);
RB_REMOVE(windows, &windows, w);
if (w->layout_root != NULL)
layout_free_cell(w->layout_root);
if (w->saved_layout_root != NULL)
layout_free_cell(w->saved_layout_root);
layout_free_cell(w->layout_root);
layout_free_cell(w->saved_layout_root);
free(w->old_layout);
window_destroy_panes(w);