summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-10-02 19:55:40 +0000
committerChristian Persch <chpe@src.gnome.org>2008-10-02 19:55:40 +0000
commit8afb9c371a45e8fe147ceb3f1b2df9d0aa7db893 (patch)
tree856134ab50267c942e5e71eb30fd68ac7826d770
parente5ad7979fb7224d7d3b18cc06999cdc52ddb0e3c (diff)
downloadgdk-pixbuf-8afb9c371a45e8fe147ceb3f1b2df9d0aa7db893.tar.gz
Bug 554696 – invalid free function used
svn path=/branches/gtk-2-14/; revision=21575
-rw-r--r--ChangeLog6
-rw-r--r--gtk/gtkfilesystemmodel.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d8eff3f3a..7689f133a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-10-02 Christian Persch
+ Bug 554696 – invalid free function used
+
+ * gtk/gtkfilesystemmodel.c: Use the right free func.
+
+2008-10-02 Christian Persch
+
Bug 554691 – mem leak in filechooser
* gtk/gtkfilesystemmodel.c: Plug a mem leak.
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index aab21109d..de08a6374 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -1022,7 +1022,7 @@ ref_path_cb (GCancellable *cancellable,
goto out;
}
- g_object_unref (info->files);
+ g_object_unref (info->files->data);
info->files = g_slist_remove (info->files, info->files->data);
if (g_slist_length (info->files) < 1)
@@ -1070,7 +1070,8 @@ ref_path_cb (GCancellable *cancellable,
out:
if (info->node)
unref_node_and_parents (info->model, info->node);
- g_object_unref (info->files);
+ g_slist_foreach (info->files, (GFunc)g_object_unref, NULL);
+ g_slist_free (info->files);
g_slist_foreach (info->cleanups, (GFunc)g_object_unref, NULL);
g_slist_free (info->cleanups);
g_object_unref (info->model);