From ed47c55e55e4acf6e4e32f71d7901327b72d274c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 Jan 2009 06:05:12 +0000 Subject: [PATCH] Fix a leak svn path=/branches/glib-2-18/; revision=7790 --- gio/ChangeLog | 15 ++++++++++++++- gio/gunixmounts.c | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 837f97c8d..36afeaa94 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,22 +1,33 @@ +2009-01-09 Matthias Clasen + + 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 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 * gfile.c: Change docs about G_FILE_COPY_ALL_METADATA to not mention - mtime as an example. + mtime as an example. 2009-01-09 Matthias Clasen Merged from trunk: 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 @@ -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 diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index 6b95d74ba..87efce425 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -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);