From 550667a9ea9edcec3071a1d7ec7c868aa7c791ad Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 19 May 2020 18:47:38 +0200 Subject: term: scrolling: calling function must clamp scroll amount --- terminal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index 2bb94338..5dd29aa0 100644 --- a/terminal.c +++ b/terminal.c @@ -1744,8 +1744,8 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows LOG_DBG("scroll: rows=%d, region.start=%d, region.end=%d", rows, region.start, region.end); - /* Clamp scroll amount */ - rows = min(rows, region.end - region.start); + /* Verify scroll amount has been clamped */ + assert(rows <= region.end - region.start); /* Cancel selections that cannot be scrolled */ if (unlikely(term->selection.start.row != -1)) { @@ -1816,8 +1816,8 @@ term_scroll_reverse_partial(struct terminal *term, LOG_DBG("scroll reverse: rows=%d, region.start=%d, region.end=%d", rows, region.start, region.end); - /* Clamp scroll amount */ - rows = min(rows, region.end - region.start); + /* Verify scroll amount has been clamped */ + assert(rows <= region.end - region.start); /* Cancel selections that cannot be scrolled */ if (unlikely(term->selection.start.row != -1)) { -- cgit v1.3