aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-07-11 09:31:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-07-11 09:31:11 +0000
commitf030c87ee6b7f94e3704ae5c94667b7d46f30776 (patch)
tree1e58f8bfeff3ba19d6cb10d466c84142e03a4b88
parentMerge branch 'crash-in-url-mode-remove-duplicates' (diff)
url-mode: abort when running into un-allocated scrollback memory
When tagging URL cells (in preparation for rendering URL mode), we loop the URL’s entire range, setting the `url` attribute of all cells, and dirtying the rows. It is possible to create URLs that are invalid, and wrap around the scrollback, even though the scrollback hasn’t yet been filled. For example, by starting an OSC-8 URL, moving the cursor, and then closing the OSC-8 URL. These URLs are invalid, but are still rendered just fine. “Fine” being relative - they will typically fill the entire screen. But at least that’s a very clear indication for the user that’s something is wrong. The problem is when we hit un-allocated scrollback rows. We didn’t check for NULL rows, and crashed. This has now been fixed.
-rw-r--r--CHANGELOG.md2
-rw-r--r--url-mode.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index acea5f9c..f7bd40d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,8 @@
URLs.
* Double free of URL while removing duplicated and/or overlapping URLs
in URL mode (https://codeberg.org/dnkl/foot/issues/627).
+* Crash when an unclosed OSC-8 URL ran into un-allocated scrollback
+ rows.
### Security
diff --git a/url-mode.c b/url-mode.c
index 94c05b3a..524b8d1b 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -654,6 +654,11 @@ tag_cells_for_url(struct terminal *term, const struct url *url, bool value)
c = 0;
row = term->grid->rows[r];
+ if (row == NULL) {
+ /* Un-allocated scrollback. This most likely means a
+ * runaway OSC-8 URL. */
+ break;
+ }
row->dirty = true;
}
}