aboutsummaryrefslogtreecommitdiff
path: root/sixel.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2026-05-22 09:18:15 +0000
committerDaniel Eklöf <daniel@ekloef.se>2026-05-22 09:50:42 +0000
commit92187d2e4e1980b31ff2aa174d7f917d0945e175 (patch)
tree1d0991fb075c146de6feadc4b2d06e0e048f1aae /sixel.c
parentselection: do not copy empty text (diff)
sixel: clamp max width/height in 'CSI ? 2 ; 3 ; W ; H S'sixel-heap-buffer-overflow
This ensures the user cannot raise the maximum sixel size, where width*height cannot be represented as an integer. Note, we should consider moving all sixel width/height variables from int to size_t. But, since it doesn't make any sense with overly large sixel images, clamping the max width/height is enough. Add a static_assert() that checks SIXEL_MAX_WIDTH * SIXEL_MAX_HEIGHT doesn't overflow. Closes #2343
Diffstat (limited to 'sixel.c')
-rw-r--r--sixel.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sixel.c b/sixel.c
index 187f1348..1db6336d 100644
--- a/sixel.c
+++ b/sixel.c
@@ -2207,9 +2207,11 @@ sixel_geometry_reset(struct terminal *term)
void
sixel_geometry_set(struct terminal *term, unsigned width, unsigned height)
{
- LOG_DBG("sixel geometry set to %ux%u", width, height);
- term->sixel.max_width = width;
- term->sixel.max_height = height;
+ const unsigned new_width = min(width, SIXEL_MAX_WIDTH);
+ const unsigned new_height = min(height, SIXEL_MAX_HEIGHT);
+ LOG_DBG("sixel geometry set to %ux%u", new_width, new_height);
+ term->sixel.max_width = new_width;
+ term->sixel.max_height = new_height;
sixel_geometry_report_current(term);
}