mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-05 01:40:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

selection: wrap pivot_{start,end}->row before accessing grid row array

Browse source
This commit is contained in:
Daniel Eklöf 2021-01-03 15:32:00 +01:00
parent 8113d2205d
commit 2b195d2cc3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
selection.c
View file

@ -590,7 +590,7 @@ selection_update(struct terminal *term, int col, int row)
/* First, make sure ‘start’ isn’t in the middle of a /* First, make sure ‘start’ isn’t in the middle of a
* multi-column character */ * multi-column character */
while (true) { while (true) {
const struct row *row = term->grid->rows[pivot_start->row]; const struct row *row = term->grid->rows[pivot_start->row & (term->grid->num_rows - 1)];
const struct cell *cell = &row->cells[pivot_start->col]; const struct cell *cell = &row->cells[pivot_start->col];
if (cell->wc != CELL_MULT_COL_SPACER) if (cell->wc != CELL_MULT_COL_SPACER)
@ -615,7 +615,7 @@ selection_update(struct terminal *term, int col, int row)
if (new_direction == SELECTION_RIGHT) { if (new_direction == SELECTION_RIGHT) {
bool keep_going = true; bool keep_going = true;
while (keep_going) { while (keep_going) {
const struct row *row = term->grid->rows[pivot_end->row]; const struct row *row = term->grid->rows[pivot_end->row & (term->grid->num_rows - 1)];
const wchar_t wc = row->cells[pivot_end->col].wc; const wchar_t wc = row->cells[pivot_end->col].wc;
keep_going = wc == CELL_MULT_COL_SPACER; keep_going = wc == CELL_MULT_COL_SPACER;
@ -631,7 +631,7 @@ selection_update(struct terminal *term, int col, int row)
} else { } else {
bool keep_going = true; bool keep_going = true;
while (keep_going) { while (keep_going) {
const struct row *row = term->grid->rows[pivot_start->row]; const struct row *row = term->grid->rows[pivot_start->row & (term->grid->num_rows - 1)];
const wchar_t wc = pivot_start->col < term->cols - 1 const wchar_t wc = pivot_start->col < term->cols - 1
? row->cells[pivot_start->col + 1].wc : 0; ? row->cells[pivot_start->col + 1].wc : 0;
@ -647,8 +647,10 @@ selection_update(struct terminal *term, int col, int row)
} }
} }
assert(term->grid->rows[pivot_start->row]->cells[pivot_start->col].wc != CELL_MULT_COL_SPACER); assert(term->grid->rows[pivot_start->row & (term->grid->num_rows - 1)]->
assert(term->grid->rows[pivot_end->row]->cells[pivot_end->col].wc != CELL_MULT_COL_SPACER); cells[pivot_start->col].wc != CELL_MULT_COL_SPACER);
assert(term->grid->rows[pivot_end->row & (term->grid->num_rows - 1)]->
cells[pivot_end->col].wc != CELL_MULT_COL_SPACER);
} }
if (new_direction == SELECTION_LEFT) { if (new_direction == SELECTION_LEFT) {