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

[ext/subsurface.git] / divelist.c

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);
 }