aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-03-30 09:08:03 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-04-18 18:07:02 +0000
commit6e782271ff433d76e192a43739eb01f175bd1995 (patch)
tree5323673219551829fa8f95281bb782c6867fc286
parentrevert: input: do not include consumed modifiers in the set sent to the client (diff)
sixel: fix double free caused by bad free() in sixel_colors_set()
sixel_color_set() is called when the number of (sixel) color registers is changed. It frees the current palette, and changes the “palette size” variable. Originally, we only had a single palette. This is the one free:d by sixel_color_set(). Later, we added support for private vs. shared palettes. With this change, we now have one palette that is “never” free:d (the shared one), and a private palette that is always free:d after a sixel has been emitted. ‘sixel.palette’ is a pointer to the palette currently in use, and should only be accessed **while emitting a sixel**. This is the pointer sixel_color_set() free:d. So for example, if ‘sixel.palette’ pointed to the shared palette, we’d free the shared palette. But, we didn’t reset ‘sixel.shared_palette’, causing a double free later on. Closes #427
-rw-r--r--CHANGELOG.md3
-rw-r--r--sixel.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40706868..16b5f9c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,9 @@
* Reverted _"Consumed modifiers are no longer sent to the client
application"_ (https://codeberg.org/dnkl/foot/issues/425).
+* Crash caused by a double free originating in `XTSMGRAPHICS` - set
+ number of color registers
+ (https://codeberg.org/dnkl/foot/issues/427).
### Security
diff --git a/sixel.c b/sixel.c
index cac60493..903fe8e4 100644
--- a/sixel.c
+++ b/sixel.c
@@ -1344,8 +1344,10 @@ sixel_colors_set(struct terminal *term, unsigned count)
unsigned new_palette_size = min(max(2, count), SIXEL_MAX_COLORS);
LOG_DBG("sixel palette size set to %u", new_palette_size);
- free(term->sixel.palette);
- term->sixel.palette = NULL;
+ free(term->sixel.private_palette);
+ free(term->sixel.shared_palette);
+ term->sixel.private_palette = NULL;
+ term->sixel.shared_palette = NULL;
term->sixel.palette_size = new_palette_size;
sixel_colors_report_current(term);