Fix a leak

svn path=/branches/glib-2-18/; revision=7790
This commit is contained in:
Matthias Clasen 2009-01-09 06:05:12 +00:00
parent 23a8c42d91
commit ed47c55e55
2 changed files with 15 additions and 2 deletions

View File

@ -1,9 +1,18 @@
2009-01-09 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
* gio/gunixmounts.c (g_unix_mount_at): fix leak that occurs when
multiple mount entries match the requested path (Ryan Lortie)
2009-01-09 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
Bug 515777 - incorrect date&time on copy
Patch by Alexander Larsson
* glocalfile.c:
(g_local_file_class_init):
Copy mtime by default
@ -18,6 +27,8 @@
Bug 558298 Hide ecryptfs mounts
Patch by Martin Pitti
* gunixmounts.c: (guess_system_internal): Hide ecryptfs mounts,
so that the desktop does not show both the mount and the target
directory. Patch by Martin Pitt
@ -35,6 +46,8 @@
Merged from trunk:
Patch by Martin Pitti
Bug 526320 should not list mounts that the user doesn't have
permission to use

View File

@ -1054,7 +1054,7 @@ g_unix_mount_at (const char *mount_path,
{
mount_entry = l->data;
if (strcmp (mount_path, mount_entry->mount_path) == 0)
if (!found && strcmp (mount_path, mount_entry->mount_path) == 0)
found = mount_entry;
else
g_unix_mount_free (mount_entry);