aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2018-10-02 13:46:53 +0200
committerBjörn Linse <bjorn.linse@gmail.com>2018-10-06 11:29:51 +0200
commitcc305213d78e282d9e8a43106491d033e990ccdc (patch)
treea34ecdb5a0b4f1510f5a81fa07f2754f422eba6d
parent39ad99b594aa68b6c3024dd9bfa3f7e31c14dff9 (diff)
downloadrneovim-cc305213d78e282d9e8a43106491d033e990ccdc.tar.gz
rneovim-cc305213d78e282d9e8a43106491d033e990ccdc.tar.bz2
rneovim-cc305213d78e282d9e8a43106491d033e990ccdc.zip
TUI: always use safe cursor movement after resize
The old code could lead to a memory error in the following situation: 0. The previous cursor position was row 50 since before, on a grid larger than 50 rows. 1. grid_resize changes the grid height to 40, and invalidly assumes the resize moved the physical cursor to row 0 2. Some event used a operation that could move the cursor (such as clear), and then reset the cursor to the "true" position row 50 (pointless after #8221, but I forgot to remove it) 3. raw_line/cheap_to_print is invoked, and tries to inspect the grid at row 50 (memory error) 4. grid_cursor_goto would have been called at this point, and set a valid cursor position 0-39.
-rw-r--r--src/nvim/tui/tui.c19
-rw-r--r--src/nvim/ugrid.c1
2 files changed, 11 insertions, 9 deletions
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 3ed0fe0cd6..bc85b43401 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -577,7 +577,7 @@ static void final_column_wrap(UI *ui)
{
TUIData *data = ui->data;
UGrid *grid = &data->grid;
- if (grid->col == ui->width) {
+ if (grid->row != -1 && grid->col == ui->width) {
grid->col = 0;
if (grid->row < MIN(ui->height, grid->height - 1)) {
grid->row++;
@@ -647,6 +647,9 @@ static void cursor_goto(UI *ui, int row, int col)
ugrid_goto(grid, row, col);
return;
}
+ if (grid->row == -1) {
+ goto safe_move;
+ }
if (0 == col ? col != grid->col :
row != grid->row ? false :
1 == col ? 2 < grid->col && cheap_to_print(ui, grid->row, 0, col) :
@@ -725,6 +728,8 @@ static void cursor_goto(UI *ui, int row, int col)
return;
}
}
+
+safe_move:
unibi_goto(ui, row, col);
ugrid_goto(grid, row, col);
}
@@ -782,9 +787,6 @@ static void clear_region(UI *ui, int top, int bot, int left, int right,
data->did_resize = false;
}
}
-
- // restore cursor
- cursor_goto(ui, data->row, data->col);
}
static void set_scroll_region(UI *ui, int top, int bot, int left, int right)
@@ -808,7 +810,7 @@ static void set_scroll_region(UI *ui, int top, int bot, int left, int right)
unibi_out(ui, unibi_set_right_margin_parm);
}
}
- unibi_goto(ui, grid->row, grid->col);
+ grid->row = -1;
}
static void reset_scroll_region(UI *ui, bool fullwidth)
@@ -836,7 +838,7 @@ static void reset_scroll_region(UI *ui, bool fullwidth)
}
unibi_out_ext(ui, data->unibi_ext.disable_lr_margin);
}
- unibi_goto(ui, grid->row, grid->col);
+ grid->row = -1;
}
static void tui_grid_resize(UI *ui, Integer g, Integer width, Integer height)
@@ -864,6 +866,7 @@ static void tui_grid_resize(UI *ui, Integer g, Integer width, Integer height)
}
} else { // Already handled the SIGWINCH signal; avoid double-resize.
got_winch = false;
+ grid->row = -1;
}
}
@@ -880,9 +883,10 @@ static void tui_grid_clear(UI *ui, Integer g)
static void tui_grid_cursor_goto(UI *ui, Integer grid, Integer row, Integer col)
{
TUIData *data = ui->data;
+
+ // cursor position is validated in tui_flush
data->row = (int)row;
data->col = (int)col;
- cursor_goto(ui, (int)row, (int)col);
}
CursorShape tui_cursor_decode_shape(const char *shape_str)
@@ -1070,7 +1074,6 @@ static void tui_grid_scroll(UI *ui, Integer g, Integer startrow, Integer endrow,
if (!data->scroll_region_is_full_screen) {
reset_scroll_region(ui, fullwidth);
}
- cursor_goto(ui, data->row, data->col);
if (!(data->bce || no_bg(ui, data->clear_attrs))) {
// Scrolling will leave wrong background in the cleared area on non-BCE
diff --git a/src/nvim/ugrid.c b/src/nvim/ugrid.c
index e2b92d7112..b741a61d8c 100644
--- a/src/nvim/ugrid.c
+++ b/src/nvim/ugrid.c
@@ -32,7 +32,6 @@ void ugrid_resize(UGrid *grid, int width, int height)
grid->cells[i] = xcalloc((size_t)width, sizeof(UCell));
}
- grid->row = grid->col = 0;
grid->width = width;
grid->height = height;
}