Merge branch 'suit' of git://git.hohndel.org/subsurface

Pull exposure suit tracking from Dirk Hohndel.

* 'suit' of git://git.hohndel.org/subsurface:
  Add exposure protection tracking

diff --git a/divelist.c b/divelist.c
index 8cf079391bba04710be801558e137e6d1dd4e0b4..36c5883b1e0e15784fa2a34741fb26372c87bc6c 100644 (file)
--- a/divelist.c
+++ b/divelist.c
@@ -565,7 +565,8 @@ static void fill_one_dive(struct dive *dive,
                DIVE_SUIT, suit,
                -1);
 
-       /* this will create a merge conflict with the memory leak patches */
+       free(location);
+       free(cylinder);
        free(suit);
 }
 

diff --git a/info.c b/info.c
index 09d61c83544756f92dca1643585d302a38392a33..a28e793905f1b4784a5d3d75077d90e5da1b00e7 100644 (file)
--- a/info.c
+++ b/info.c
@@ -243,6 +243,8 @@ static gboolean match_string_entry(GtkTreeModel *model, GtkTreePath *path, GtkTr
 
        gtk_tree_model_get(model, iter, 0, &entry, -1);
        cmp = strcmp(entry, string);
+       if (entry)
+               free(entry);
 
        /* Stop. The entry is bigger than the new one */
        if (cmp > 0)