aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--sixel.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5503dc44..326461d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
(https://codeberg.org/dnkl/foot/issues/210).
* Key mappings for key combinations with `alt`+`return`.
* `footclient` `-m` (`--maximized`) flag being ignored.
+* Crash with explicitly sized sixels with a height less than 6 pixels.
## 1.5.3
diff --git a/sixel.c b/sixel.c
index 898b8713..0c2f213f 100644
--- a/sixel.c
+++ b/sixel.c
@@ -804,9 +804,6 @@ resize(struct terminal *term, int new_width, int new_height)
assert(alloc_new_height >= new_height);
assert(alloc_new_height - new_height < 6);
- assert(new_width >= old_width);
- assert(new_height >= old_height);
-
uint32_t *new_data = NULL;
if (new_width == old_width) {
@@ -827,7 +824,7 @@ resize(struct terminal *term, int new_width, int new_height)
new_data = xmalloc(alloc_new_width * alloc_new_height * sizeof(uint32_t));
/* Copy old rows, and initialize new columns to background color */
- for (int r = 0; r < old_height; r++) {
+ for (int r = 0; r < min(old_height, new_height); r++) {
memcpy(&new_data[r * new_width], &old_data[r * old_width], old_width * sizeof(uint32_t));
for (int c = old_width; c < new_width; c++)