From ee3935c371370ec10fab04efbf9f7b60374b2a86 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 23 Nov 2020 19:22:40 +0100 Subject: sixel: fix crash when an explicit sixel size had a height less than 6 pixels --- sixel.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sixel.c') 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++) -- cgit v1.3