From 2e828248d07490bd56baa3458a970e1ad34ede7c Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 7 Feb 2022 13:56:55 +0100 Subject: selection: ensure start/end coordinates are bounded by the current grid Closes #924 --- selection.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/selection.c b/selection.c index 0ed25cd7..5d2cd61d 100644 --- a/selection.c +++ b/selection.c @@ -1108,16 +1108,8 @@ selection_finalize(struct seat *seat, struct terminal *term, uint32_t serial) xassert(term->selection.start.row != -1); xassert(term->selection.end.row != -1); - if (term->selection.start.row > term->selection.end.row || - (term->selection.start.row == term->selection.end.row && - term->selection.start.col > term->selection.end.col)) - { - struct coord tmp = term->selection.start; - term->selection.start = term->selection.end; - term->selection.end = tmp; - } - - xassert(term->selection.start.row <= term->selection.end.row); + term->selection.start.row &= (term->grid->num_rows - 1); + term->selection.end.row &= (term->grid->num_rows - 1); switch (term->conf->selection_target) { case SELECTION_TARGET_NONE: -- cgit v1.3