Skip to content

Commit 4c24c8d

Browse files
committed
Fix two small memory leaks in config mechanism.
The memory dangling off ssd->sesslist should be freed when ssd itself goes away, and the font settings ctrlset we delete in gtkcfg.c should be freed as well once it's been removed from its containing array. Thanks to Ranjini Aravind for pointing these out. (cherry picked from commit f4956a1)
1 parent 452c49a commit 4c24c8d

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

config.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,7 @@ struct sessionsaver_data {
568568
static void sessionsaver_data_free(void *ssdv)
569569
{
570570
struct sessionsaver_data *ssd = (struct sessionsaver_data *)ssdv;
571+
get_sesslist(&ssd->sesslist, FALSE);
571572
sfree(ssd->savedsession);
572573
sfree(ssd);
573574
}

unix/gtkcfg.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ void gtk_setup_config_box(struct controlbox *b, int midsession, void *win)
8181
memmove(b->ctrlsets+i, b->ctrlsets+i+1,
8282
(b->nctrlsets-i-1) * sizeof(*b->ctrlsets));
8383
b->nctrlsets--;
84+
ctrl_free_set(s2);
8485
break;
8586
}
8687
}

0 commit comments

Comments
 (0)