mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-17 06:46:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sixel: resize: check new width/height against max geometry early

Browse source
This commit is contained in:
Daniel Eklöf 2021-03-07 11:08:01 +01:00
parent 6416319a99
commit 891e0819f0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sixel.c
View file

@ -849,15 +849,6 @@ resize(struct terminal *term, int new_width, int new_height)
term->sixel.image.width, term->sixel.image.height, term->sixel.image.width, term->sixel.image.height,
new_width, new_height); new_width, new_height);
uint32_t *old_data = term->sixel.image.data;
const int old_width = term->sixel.image.width;
const int old_height = term->sixel.image.height;
int alloc_new_width = new_width;
int alloc_new_height = (new_height + 6 - 1) / 6 * 6;
xassert(alloc_new_height >= new_height);
xassert(alloc_new_height - new_height < 6);
if (new_width > term->sixel.max_width) if (new_width > term->sixel.max_width)
return false; return false;
@ -872,6 +863,15 @@ resize(struct terminal *term, int new_width, int new_height)
if (new_height > (term->sixel.max_height + 5) / 6 * 6) if (new_height > (term->sixel.max_height + 5) / 6 * 6)
return false; return false;
uint32_t *old_data = term->sixel.image.data;
const int old_width = term->sixel.image.width;
const int old_height = term->sixel.image.height;
int alloc_new_width = new_width;
int alloc_new_height = (new_height + 6 - 1) / 6 * 6;
xassert(alloc_new_height >= new_height);
xassert(alloc_new_height - new_height < 6);
uint32_t *new_data = NULL; uint32_t *new_data = NULL;
if (new_width == old_width) { if (new_width == old_width) {