From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 30 Jul 2008 16:45:46 +0000 (+0000)
Subject: Bug 545457 – gdmsetup crashed with SIGSEGV in
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4d23d2647a324c33de1e8bfbbf1d5720ec8bb728;p=dana%2Fcg-glib.git

Bug 545457 – gdmsetup crashed with SIGSEGV in

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.


svn path=/trunk/; revision=7274
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 36d786ea..5a7eb954 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2008-07-28  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 545203 – gfile.c: argument is different type.
diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
index cbf5b834..6fd389e5 100644
--- a/gio/gunixvolumemonitor.c
+++ b/gio/gunixvolumemonitor.c
@@ -150,7 +150,10 @@ get_mount_for_mount_path (const char *mount_path,
   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);