From 1ff1b3a71e8edcad62c98a3c80b6e1d8a77bc26f Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 16:27:55 +0200 Subject: grid: don't pre-allocate the entire grid (with all scrollback lines) The row array may now contain NULL pointers. This means the corresponding row hasn't yet been allocated and initialized. On a resize, we explicitly allocate the visible rows. Uninitialized rows are then allocated the first time they are referenced. --- main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index dd16d277..0b3485bc 100644 --- a/main.c +++ b/main.c @@ -624,15 +624,11 @@ out: if (term.kbd.xkb != NULL) xkb_context_unref(term.kbd.xkb); - for (int row = 0; row < term.normal.num_rows; row++) { - free(term.normal.rows[row]->cells); - free(term.normal.rows[row]); - } + for (int row = 0; row < term.normal.num_rows; row++) + grid_row_free(term.normal.rows[row]); free(term.normal.rows); - for (int row = 0; row < term.alt.num_rows; row++) { - free(term.alt.rows[row]->cells); - free(term.alt.rows[row]); - } + for (int row = 0; row < term.alt.num_rows; row++) + grid_row_free(term.alt.rows[row]); free(term.alt.rows); for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) { -- cgit v1.3