From 483ea4ae73658b61ff6f680b022533e5f88eddd2 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 19 May 2020 18:51:56 +0200 Subject: scrolling: fix crash when offset was exactly at the wrap-around When making sure we don't scroll past the scrollback history, and the current offset was exactly at the wrap around, the new view port was set to offset+1, which in this particular case meant outside the valid row numbers. --- commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index 2727c1f2..e199e4f4 100644 --- a/commands.c +++ b/commands.c @@ -48,10 +48,10 @@ cmd_scrollback_up(struct terminal *term, int rows) if (end >= term->grid->offset) { /* Not wrapped */ if (new_view >= term->grid->offset && new_view <= end) - new_view = end + 1; + new_view = (end + 1) % term->grid->num_rows; } else { if (new_view >= term->grid->offset || new_view <= end) - new_view = end + 1; + new_view = (end + 1) % term->grid->num_rows; } while (term->grid->rows[new_view] == NULL) -- cgit v1.3