mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-03 07:15:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sixel: remove sixel-to-be-splitted *before* splitting it

Browse source 
This fixes an assertion in debug builds, due to the pre-splitted and
splitted sixels overlapping.
This commit is contained in:
Daniel Eklöf 2020-07-23 18:15:29 +02:00
parent fda6e9c2c9
commit f6473756d9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -23,6 +23,8 @@
* Crash when overwriting a sixel and the row being overwritten did not * Crash when overwriting a sixel and the row being overwritten did not
cover an entire cell. cover an entire cell.
* Assertion failure in debug builds when overwriting a sixel image.
### Security ### Security

12
sixel.c
View file

@ -350,9 +350,11 @@ _sixel_overwrite_by_rectangle(
(col <= col_end && col + width - 1 >= col_end) || (col <= col_end && col + width - 1 >= col_end) ||
(col >= col_start && col + width - 1 <= col_end)) (col >= col_start && col + width - 1 <= col_end))
{ {
sixel_overwrite(term, six, start, col, height, width); struct sixel to_be_erased = *six;
sixel_erase(term, six);
tll_remove(term->grid->sixel_images, it); tll_remove(term->grid->sixel_images, it);
sixel_overwrite(term, &to_be_erased, start, col, height, width);
sixel_erase(term, &to_be_erased);
} }
} }
} }
@ -421,9 +423,11 @@ sixel_overwrite_by_row(struct terminal *term, int _row, int col, int width)
(col <= col_end && col + width - 1 >= col_end) || (col <= col_end && col + width - 1 >= col_end) ||
(col >= col_start && col + width - 1 <= col_end)) (col >= col_start && col + width - 1 <= col_end))
{ {
sixel_overwrite(term, six, row, col, 1, width); struct sixel to_be_erased = *six;
sixel_erase(term, six);
tll_remove(term->grid->sixel_images, it); tll_remove(term->grid->sixel_images, it);
sixel_overwrite(term, &to_be_erased, row, col, 1, width);
sixel_erase(term, &to_be_erased);
} }
} }
} }