From a012c2fb3efbac49b4333a62cfd7cc1df9ee6aef Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 26 May 2021 13:59:32 +0200 Subject: term: fix crash when an OSC-8 URI wraps around the scrollback Long OSC-8 URIs, that are split up over multiple rows, are handled by emitting one URI range on each row the URL touches. This was done by initializing a row index variable, and then incrementing it each loop iteration. This caused an out-of-bounds array access when the row index reached the maximum number of scrollback lines. The fix is simple: make sure the row index variable wraps around, instead of incrementing without any bounds. Closes #552 --- terminal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index 06eac0d6..8a7dd826 100644 --- a/terminal.c +++ b/terminal.c @@ -3084,7 +3084,7 @@ term_osc8_close(struct terminal *term) int r = start.row; int start_col = start.col; - do { + while (true) { int end_col = r == end.row ? end.col : term->cols - 1; struct row *row = term->grid->rows[r]; @@ -3121,7 +3121,13 @@ term_osc8_close(struct terminal *term) } #endif start_col = 0; - } while (r++ != end.row); + + if (r == end.row) + break; + + r++; + r &= term->grid->num_rows - 1; + } done: free(term->vt.osc8.uri); -- cgit v1.3