diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-09-11 19:02:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-09-11 19:02:23 +0000 |
| commit | c0c69ece01124cd55065d2b425baf1d56fd1ea07 (patch) | |
| tree | 973b6f376b76366390ab9a43fad67a7ccef4f814 | |
| parent | 73ea169266e2de033846ec7eb86e742c1134c837 (diff) | |
| download | glib-c0c69ece01124cd55065d2b425baf1d56fd1ea07.tar.gz | |
Bug 546079 – leak in xdgmime
* xdgmime/xdgmime.c (xdg_mime_shutdown): Fix memory leak.
svn path=/branches/glib-2-16/; revision=7464
| -rw-r--r-- | gio/ChangeLog | 9 | ||||
| -rw-r--r-- | gio/xdgmime/xdgmime.c | 12 |
2 files changed, 21 insertions, 0 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog index de176edc1..20f37c6ff 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -2,6 +2,15 @@ Merge from trunk + Bug 546079 – leak in xdgmime + + * xdgmime/xdgmime.c (xdg_mime_shutdown): Fix memory leak. + Patch by Carlos Garcia Campos + +2008-09-11 Matthias Clasen <mclasen@redhat.com> + + Merge from trunk + Bug 545457 – gdmsetup crashed with SIGSEGV in g_unix_mount_guess_should_display() diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c index 332c16537..9709b6f97 100644 --- a/gio/xdgmime/xdgmime.c +++ b/gio/xdgmime/xdgmime.c @@ -601,6 +601,18 @@ xdg_mime_shutdown (void) _xdg_mime_parent_list_free (parent_list); parent_list = NULL; } + + if (icon_list) + { + _xdg_mime_icon_list_free (icon_list); + icon_list = NULL; + } + + if (generic_icon_list) + { + _xdg_mime_icon_list_free (generic_icon_list); + generic_icon_list = NULL; + } if (_caches) { |