diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-16 10:10:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 10:10:02 +0100 |
| commit | 1c6e956079585fcba401f9d46c5e7f9248ee50f6 (patch) | |
| tree | 4154b1de46005939affd70d76be08af6dde200eb /src | |
| parent | 60d6a8b13d2eb5cdc5ab2740a9becc3b24e1eb71 (diff) | |
| parent | fed928b438ca64c96546959cc0c981dbff0bad0c (diff) | |
| download | rneovim-1c6e956079585fcba401f9d46c5e7f9248ee50f6.tar.gz rneovim-1c6e956079585fcba401f9d46c5e7f9248ee50f6.tar.bz2 rneovim-1c6e956079585fcba401f9d46c5e7f9248ee50f6.zip | |
Merge #7862 'fix resize-related segfaults'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/tui/tui.c | 2 | ||||
| -rw-r--r-- | src/nvim/ugrid.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index df5b41a64b..2349bd2ae9 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -500,7 +500,7 @@ static void final_column_wrap(UI *ui) UGrid *grid = &data->grid; if (grid->col == ui->width) { grid->col = 0; - if (grid->row < ui->height) { + if (grid->row < MIN(ui->height, grid->height - 1)) { grid->row++; } } diff --git a/src/nvim/ugrid.c b/src/nvim/ugrid.c index 2b5e96ee60..e0880b4c76 100644 --- a/src/nvim/ugrid.c +++ b/src/nvim/ugrid.c @@ -135,6 +135,7 @@ static void destroy_cells(UGrid *grid) xfree(grid->cells[i]); } xfree(grid->cells); + grid->cells = NULL; } } |