From 4d23d2647a324c33de1e8bfbbf1d5720ec8bb728 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 30 Jul 2008 16:45:46 +0000 Subject: [PATCH] =?utf8?q?Bug=20545457=20=E2=80=93=20gdmsetup=20crashed=20?= =?utf8?q?with=20SIGSEGV=20in?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-07-30 Matthias Clasen 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 --- gio/ChangeLog | 8 ++++++++ gio/gunixvolumemonitor.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 36d786e..5a7eb95 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,11 @@ +2008-07-30 Matthias Clasen + + 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 Bug 545203 – gfile.c: argument is different type. diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c index cbf5b83..6fd389e 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); -- 2.7.4