[gnome-disk-utility/udisks2-port] Don't dereference NULL pointer if there is no drive
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/udisks2-port] Don't dereference NULL pointer if there is no drive
- Date: Fri, 20 Jan 2012 16:50:16 +0000 (UTC)
commit 803ef4e4108ba59115292d1193181fe61e330cd9
Author: David Zeuthen <davidz redhat com>
Date: Fri Jan 20 11:49:57 2012 -0500
Don't dereference NULL pointer if there is no drive
Signed-off-by: David Zeuthen <davidz redhat com>
src/palimpsest/gduwindow.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 29f936e..e9a9324 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -1699,7 +1699,7 @@ update_device_page_for_block (GduWindow *window,
gboolean read_only;
gchar *s;
UDisksObject *drive_object;
- UDisksDrive *drive;
+ UDisksDrive *drive = NULL;
read_only = udisks_block_get_read_only (block);
partition = udisks_object_peek_partition (object);
@@ -1715,7 +1715,7 @@ update_device_page_for_block (GduWindow *window,
}
/* TODO: don't show on CD-ROM drives etc. */
- if (udisks_block_get_size (block) > 0 || !udisks_drive_get_media_change_detected (drive))
+ if (udisks_block_get_size (block) > 0 || (drive != NULL && !udisks_drive_get_media_change_detected (drive)))
{
*show_flags |= SHOW_FLAGS_POPUP_MENU_CREATE_VOLUME_IMAGE;
*show_flags |= SHOW_FLAGS_DISK_POPUP_MENU_CREATE_DISK_IMAGE;
@@ -1835,7 +1835,7 @@ update_device_page_for_block (GduWindow *window,
}
else
{
- if (udisks_drive_get_ejectable (drive))
+ if (drive != NULL && udisks_drive_get_ejectable (drive))
*show_flags |= SHOW_FLAGS_EJECT_BUTTON;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]