glib r7274 - trunk/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Jul 30 16:45:46 2008
New Revision: 7274
URL: http://svn.gnome.org/viewvc/glib?rev=7274&view=rev

Log:
2008-07-30  Matthias Clasen  <mclasen redhat com>

        Bug 545457 â gdmsetup crashed with SIGSEGV in
        g_unix_mount_guess_should_display()

        * gunixvolumemonitor.c (get_mount_for_mount_path): Don't
        crash if no mount is found.



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gunixvolumemonitor.c

Modified: trunk/gio/gunixvolumemonitor.c
==============================================================================
--- trunk/gio/gunixvolumemonitor.c	(original)
+++ trunk/gio/gunixvolumemonitor.c	Wed Jul 30 16:45:46 2008
@@ -150,7 +150,10 @@
   GUnixMount *mount;
 
   mount_entry = g_unix_mount_at (mount_path, NULL);
-  
+
+  if (!mount_entry)
+    return NULL;
+
   /* TODO: Set mountable volume? */
   mount = _g_unix_mount_new (NULL, mount_entry, NULL);