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 f4956a1f9dc66973c1a9c9196ef893412b2545d7)

diff --git a/config.c b/config.c
index 0ad554132b8cd9632c0727b4e8a54200e0bc0504..3100503f58f3a255fbd08417acc732352fe6ae79 100644 (file)
--- a/config.c
+++ b/config.c
@@ -568,6 +568,7 @@ struct sessionsaver_data {
 static void sessionsaver_data_free(void *ssdv)
 {
     struct sessionsaver_data *ssd = (struct sessionsaver_data *)ssdv;
+    get_sesslist(&ssd->sesslist, FALSE);
     sfree(ssd->savedsession);
     sfree(ssd);
 }

diff --git a/unix/gtkcfg.c b/unix/gtkcfg.c
index ab8ef973912f30044be938aa74e70cdacb97819c..958a3f6653e6a4571ab03c4ced9ffabd6566b960 100644 (file)
--- a/unix/gtkcfg.c
+++ b/unix/gtkcfg.c
@@ -81,6 +81,7 @@ void gtk_setup_config_box(struct controlbox *b, int midsession, void *win)
             memmove(b->ctrlsets+i, b->ctrlsets+i+1,
                     (b->nctrlsets-i-1) * sizeof(*b->ctrlsets));
             b->nctrlsets--;
+            ctrl_free_set(s2);
             break;
         }
     }