diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-03-30 09:19:58 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-03-30 09:19:58 +0000 |
| commit | 1b4b64dca71b73c02ce00aef0801e7ede59f52cd (patch) | |
| tree | 5323673219551829fa8f95281bb782c6867fc286 | |
| parent | Merge branch 'revert-remove-consumed-modifiers-from-set-sent-to-client' (diff) | |
| parent | sixel: fix double free caused by bad free() in sixel_colors_set() (diff) | |
Merge branch 'sixel-fix-double-free-in-set-palette-size'
Closes #427
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | sixel.c | 6 |
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 @@ -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); |
