diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-05-19 16:47:38 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-05-19 16:47:38 +0000 |
| commit | 550667a9ea9edcec3071a1d7ec7c868aa7c791ad (patch) | |
| tree | 749ddb57d46f3d8a27b583fdceef8c531c14a78a | |
| parent | readme: add suggested cflags for a release build (diff) | |
term: scrolling: calling function must clamp scroll amount
| -rw-r--r-- | csi.c | 16 | ||||
| -rw-r--r-- | terminal.c | 8 |
2 files changed, 16 insertions, 8 deletions
@@ -650,13 +650,21 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } - case 'S': - term_scroll(term, vt_param_get(term, 0, 1)); + case 'S': { + int amount = min( + vt_param_get(term, 0, 1), + term->scroll_region.end - term->scroll_region.start); + term_scroll(term, amount); break; + } - case 'T': - term_scroll_reverse(term, vt_param_get(term, 0, 1)); + case 'T': { + int amount = min( + vt_param_get(term, 0, 1), + term->scroll_region.end - term->scroll_region.start); + term_scroll_reverse(term, amount); break; + } case 'X': { /* Erase chars */ @@ -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)) { |
