nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Fix two small memory leaks in config mechanism.

Browse Source 
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 f4956a1f9dc66973c1a9c9196ef893412b2545d7)
This commit is contained in:
Simon Tatham 2015-05-08 18:57:18 +01:00
parent 452c49a996
commit 4c24c8dc5a
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.c
View File

@ -568,6 +568,7 @@ struct sessionsaver_data {
static void sessionsaver_data_free(void *ssdv) static void sessionsaver_data_free(void *ssdv)
{ {
struct sessionsaver_data *ssd = (struct sessionsaver_data *)ssdv; struct sessionsaver_data *ssd = (struct sessionsaver_data *)ssdv;
get_sesslist(&ssd->sesslist, FALSE);
sfree(ssd->savedsession); sfree(ssd->savedsession);
sfree(ssd); sfree(ssd);
} }

1
unix/gtkcfg.c
View File

@ -81,6 +81,7 @@ void gtk_setup_config_box(struct controlbox *b, int midsession, void *win)
memmove(b->ctrlsets+i, b->ctrlsets+i+1, memmove(b->ctrlsets+i, b->ctrlsets+i+1,
(b->nctrlsets-i-1) * sizeof(*b->ctrlsets)); (b->nctrlsets-i-1) * sizeof(*b->ctrlsets));
b->nctrlsets--; b->nctrlsets--;
ctrl_free_set(s2);
break; break;
} }
} }