aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--terminal.c29
2 files changed, 19 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a1bb982..72f46de2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -172,6 +172,9 @@
shifts (https://codeberg.org/dnkl/foot/issues/580).
* `TEXT`+`STRING`+`UTF8_STRING` mime types not being recognized in
clipboard offers (https://codeberg.org/dnkl/foot/issues/583).
+* Memory leak caused by custom box drawing glyphs not being completely
+ freed when destroying a foot window instance
+ (https://codeberg.org/dnkl/foot/issues/586).
### Security
diff --git a/terminal.c b/terminal.c
index ddc93cad..d5c1c422 100644
--- a/terminal.c
+++ b/terminal.c
@@ -609,6 +609,18 @@ term_pt_or_px_as_pixels(const struct terminal *term,
: pt_or_px->px;
}
+static void
+free_box_drawing(struct fcft_glyph **box_drawing)
+{
+ if (*box_drawing == NULL)
+ return;
+
+ free(pixman_image_get_data((*box_drawing)->pix));
+ pixman_image_unref((*box_drawing)->pix);
+ free(*box_drawing);
+ *box_drawing = NULL;
+}
+
static bool
term_set_fonts(struct terminal *term, struct fcft_font *fonts[static 4])
{
@@ -619,13 +631,8 @@ term_set_fonts(struct terminal *term, struct fcft_font *fonts[static 4])
term->fonts[i] = fonts[i];
}
- for (size_t i = 0; i < ALEN(term->box_drawing); i++) {
- if (term->box_drawing[i] != NULL) {
- pixman_image_unref(term->box_drawing[i]->pix);
- free(term->box_drawing[i]);
- term->box_drawing[i] = NULL;
- }
- }
+ for (size_t i = 0; i < ALEN(term->box_drawing); i++)
+ free_box_drawing(&term->box_drawing[i]);
const int old_cell_width = term->cell_width;
const int old_cell_height = term->cell_height;
@@ -1385,12 +1392,8 @@ term_destroy(struct terminal *term)
for (size_t i = 0; i < 4; i++)
free(term->font_sizes[i]);
- for (size_t i = 0; i < ALEN(term->box_drawing); i++) {
- if (term->box_drawing[i] != NULL) {
- pixman_image_unref(term->box_drawing[i]->pix);
- free(term->box_drawing[i]);
- }
- }
+ for (size_t i = 0; i < ALEN(term->box_drawing); i++)
+ free_box_drawing(&term->box_drawing[i]);
free(term->search.buf);