Some memory leak fixes

matthiasclasen · Dec 4, 2016 · 98bc87e · 98bc87e
1 parent 1ee9c54
commit 98bc87e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/gr-recipe-exporter.c b/src/gr-recipe-exporter.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2016 Matthias Clasen <[email protected]>
  *
  * Licensed under the GNU General Public License Version 3
+    <file preprocess="xml-stripblanks">gr-big-cuisine-tile.ui</file>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -253,7 +254,6 @@ prepare_export (GrRecipeExporter  *exporter,
                 j++;
         }
 
-
         g_key_file_set_string (keyfile, key, "Name", name ? name : "");
         g_key_file_set_string (keyfile, key, "Author", author ? author : "");
         g_key_file_set_string (keyfile, key, "Description", description ? description : "");
@@ -295,9 +295,12 @@ prepare_export (GrRecipeExporter  *exporter,
                 return FALSE;
         }
 
-        g_free (path);
-        path = g_build_filename (exporter->dir, "chefs.db", NULL);
+        g_clear_pointer (&path, g_free);
+        g_clear_pointer (&name, g_free);
+        g_clear_pointer (&description, g_free);
+        g_clear_pointer (&keyfile, g_key_file_unref);
 
+        path = g_build_filename (exporter->dir, "chefs.db", NULL);
         keyfile = g_key_file_new ();
 
         key = name = gr_chef_get_name (chef);

diff --git a/src/gr-recipe-store.c b/src/gr-recipe-store.c
@@ -358,11 +358,11 @@ load_recipes (GrRecipeStore *self,
                 }
                 if (tmp) {
                         ctime = date_time_from_string (tmp);
+                        g_free (tmp);
                         if (!ctime) {
                                 g_warning ("Failed to load recipe %s: Couldn't parse Created key", groups[i]);
                                 continue;
                         }
-                        g_free (tmp);
                 }
                 else {
                         ctime = g_date_time_new_now_utc ();
@@ -378,11 +378,11 @@ load_recipes (GrRecipeStore *self,
                 }
                 if (tmp) {
                         mtime = date_time_from_string (tmp);
+                        g_free (tmp);
                         if (!mtime) {
                                 g_warning ("Failed to load recipe %s: Couldn't parse Modified key", groups[i]);
                                 continue;
                         }
-                        g_free (tmp);
                 }
                 else {
                         mtime = g_date_time_new_now_utc ();

diff --git a/src/gr-recipe.c b/src/gr-recipe.c
@@ -98,6 +98,8 @@ gr_recipe_finalize (GObject *object)
         g_free (priv->cf_name);
         g_free (priv->cf_description);
         g_free (priv->cf_ingredients);
+        g_date_time_unref (priv->mtime);
+        g_date_time_unref (priv->ctime);
 
         G_OBJECT_CLASS (gr_recipe_parent_class)->finalize (object);
 }
@@ -226,13 +228,15 @@ gr_recipe_set_property (GObject      *object,
 
         case PROP_NAME:
                 g_free (priv->name);
+                g_free (priv->cf_name);
                 priv->name = g_value_dup_string (value);
                 priv->cf_name = g_utf8_casefold (priv->name, -1);
                 update_mtime (self);
                 break;
 
         case PROP_DESCRIPTION:
                 g_free (priv->description);
+                g_free (priv->cf_description);
                 priv->description = g_value_dup_string (value);
                 priv->cf_description = g_utf8_casefold (priv->description, -1);
                 update_mtime (self);