aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-10-13 15:52:34 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-10-13 15:52:34 +0000
commit43a48f53d42a5de21e0a6eb6783863051ad8862a (patch)
tree5c5c47025693955c08c5cc4c7b053b75efe94442
parentMerge branch 'delayed-reflow' (diff)
sixel: don’t crash when sixel image exceeds current sixel max height
When we try to resize a sixel past the current max height, we set col > image-width to signal this. This means ‘width’ could be smaller than ‘col’. When calculating how many sixels to emit in sixel_add_many(), we didnt’ account for this. The resulting value was -1, converted to ‘unsigned’. I.e. a very large value. This resulted in an assert triggering in sixel_add() in debug builds, and a crash in release builds.
-rw-r--r--CHANGELOG.md1
-rw-r--r--sixel.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f97cb252..cf6a2104 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@
built-in terminfo (accessed via XTGETTCAP).
* Crash when interactively resizing the window with a very large
scrollback.
+* Crash when a sixel image exceeds the current sixel max height.
[1173]: https://codeberg.org/dnkl/foot/issues/1173
diff --git a/sixel.c b/sixel.c
index c80a92a3..a824c405 100644
--- a/sixel.c
+++ b/sixel.c
@@ -1295,7 +1295,7 @@ sixel_add_many(struct terminal *term, uint8_t c, unsigned count)
if (unlikely(col + count - 1 >= width)) {
resize_horizontally(term, col + count);
width = term->sixel.image.width;
- count = min(count, width - col);
+ count = min(count, max(width - col, 0));
}
uint32_t color = term->sixel.color;