summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-03-04 13:51:57 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-03-04 13:51:57 +0000
commite632c50a5388d2e4db5c24667083b6dbbce4e766 (patch)
tree4d0228f327d54c663d44ed0ac9efb01a54ee72a7
parentdaa32f1ec94fc1cc66912c3640bc388c0a64edfe (diff)
downloadgvfs-e632c50a5388d2e4db5c24667083b6dbbce4e766.tar.gz
Avoid crash when mounting drive Fix leak.
2008-03-04 Alexander Larsson <alexl@redhat.com> * daemon/gvfsbackendcomputer.c: (mount_volume_from_drive): Avoid crash when mounting drive Fix leak. svn path=/trunk/; revision=1527
-rw-r--r--ChangeLog7
-rw-r--r--daemon/gvfsbackendcomputer.c7
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c9ad558..0302ed90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-03-04 Alexander Larsson <alexl@redhat.com>
+ * daemon/gvfsbackendcomputer.c:
+ (mount_volume_from_drive):
+ Avoid crash when mounting drive
+ Fix leak.
+
+2008-03-04 Alexander Larsson <alexl@redhat.com>
+
* hal/ghalmount.c:
Fix deadlock when looking for cdrom icons.
diff --git a/daemon/gvfsbackendcomputer.c b/daemon/gvfsbackendcomputer.c
index 94f8a607..e1f6e163 100644
--- a/daemon/gvfsbackendcomputer.c
+++ b/daemon/gvfsbackendcomputer.c
@@ -796,9 +796,9 @@ mount_volume_from_drive (GDrive *drive,
GVolume *volume;
volumes = g_drive_get_volumes (drive);
- volume = G_VOLUME (volumes->data);
- if (volume)
+ if (volumes)
{
+ volume = G_VOLUME (volumes->data);
g_volume_mount (volume,
0,
mount_op,
@@ -812,6 +812,9 @@ mount_volume_from_drive (GDrive *drive,
G_IO_ERROR_NOT_SUPPORTED,
_("Can't mount file"));
}
+
+ g_list_foreach (volumes, (GFunc)g_object_unref, NULL);
+ g_list_free (volumes);
}
static void