summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2006-08-08 23:35:48 +0000
committerEmmanuele Bassi <ebassi@src.gnome.org>2006-08-08 23:35:48 +0000
commitefa3ee01de62d373820e945f9d40813b01c3f691 (patch)
tree9caaabe03e436dc8a0775de612178caa6f2d45e5
parent3050782a63a711e0fa9e04da6870735b3daa919b (diff)
Plug a couple of leaks when removing data from a bookmark.
2006-08-08 Emmanuele Bassi <ebassi@gnome.org> * glib/gbookmarkfile.c (g_bookmark_file_remove_group) (g_bookmark_file_set_app_info): Plug a couple of leaks when removing data from a bookmark.
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-126
-rw-r--r--glib/gbookmarkfile.c6
3 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d9322995..b637d4cea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-08 Emmanuele Bassi <ebassi@gnome.org>
+
+ * glib/gbookmarkfile.c (g_bookmark_file_remove_group)
+ (g_bookmark_file_set_app_info): Plug a couple of leaks
+ when removing data from a bookmark.
+
2006-08-05 Matthias Clasen <mclasen@redhat.com>
* glib/gbookmarkfile.c (find_file_in_data_dirs): Correct the
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1d9322995..b637d4cea 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2006-08-08 Emmanuele Bassi <ebassi@gnome.org>
+
+ * glib/gbookmarkfile.c (g_bookmark_file_remove_group)
+ (g_bookmark_file_set_app_info): Plug a couple of leaks
+ when removing data from a bookmark.
+
2006-08-05 Matthias Clasen <mclasen@redhat.com>
* glib/gbookmarkfile.c (find_file_in_data_dirs): Correct the
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index fb67f090b..a79eb5449 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -2842,7 +2842,8 @@ g_bookmark_file_remove_group (GBookmarkFile *bookmark,
if (strcmp (l->data, group) == 0)
{
item->metadata->groups = g_list_remove_link (item->metadata->groups, l);
- g_list_free_1 (l);
+ g_free (l->data);
+ g_list_free_1 (l);
item->modified = time (NULL);
@@ -3248,7 +3249,8 @@ g_bookmark_file_set_app_info (GBookmarkFile *bookmark,
{
item->metadata->applications = g_list_remove (item->metadata->applications, ai);
g_hash_table_remove (item->metadata->apps_by_name, ai->name);
-
+ bookmark_app_info_free (ai);
+
item->modified = time (NULL);
return TRUE;