aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-02-07 14:13:31 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-02-07 14:13:31 +0000
commit22307565ac73dcade35c59111530756d33993f98 (patch)
treeae34ccd586b94ba6d540c310370ff5dffe41aa5b
parentMerge branch 'selection-handling-during-reflow' (diff)
parentchangelog: crash in pipe-scrollback (diff)
Merge branch 'pipe-scrollback-crash'
Closes #926
-rw-r--r--CHANGELOG.md2
-rw-r--r--terminal.c29
2 files changed, 21 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 309b8e99..66c5a49b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,8 @@
ongoing (https://codeberg.org/dnkl/foot/issues/922).
* Large selections crossing the scrollback wrap-around
(https://codeberg.org/dnkl/foot/issues/924).
+* Crash in `pipe-scrollback`
+ (https://codeberg.org/dnkl/foot/issues/926).
### Security
diff --git a/terminal.c b/terminal.c
index 81df743b..631e8e68 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3414,16 +3414,22 @@ rows_to_text(const struct terminal *term, int start, int end,
if (ctx == NULL)
return false;
- for (size_t r = start;
- r != ((end + 1) & (term->grid->num_rows - 1));
- r = (r + 1) & (term->grid->num_rows - 1))
- {
+ const int grid_rows = term->grid->num_rows;
+ int r = start;
+
+ while (true) {
const struct row *row = term->grid->rows[r];
xassert(row != NULL);
for (int c = 0; c < term->cols; c++)
if (!extract_one(term, row, &row->cells[c], c, ctx))
goto out;
+
+ if (r == end)
+ break;
+
+ r++;
+ r &= grid_rows - 1;
}
out:
@@ -3433,19 +3439,22 @@ out:
bool
term_scrollback_to_text(const struct terminal *term, char **text, size_t *len)
{
- int start = term->grid->offset + term->rows;
- int end = term->grid->offset + term->rows - 1;
+ const int grid_rows = term->grid->num_rows;
+ int start = (term->grid->offset + term->rows) & (grid_rows - 1);
+ int end = (term->grid->offset + term->rows - 1) & (grid_rows - 1);
+
+ xassert(start >= 0);
+ xassert(start < grid_rows);
+ xassert(end >= 0);
+ xassert(end < grid_rows);
/* If scrollback isn't full yet, this may be NULL, so scan forward
* until we find the first non-NULL row */
while (term->grid->rows[start] == NULL) {
start++;
- start &= term->grid->num_rows - 1;
+ start &= grid_rows - 1;
}
- if (end < 0)
- end += term->grid->num_rows;
-
while (term->grid->rows[end] == NULL) {
end--;
if (end < 0)