diff options
| author | Stefan Walter <stefw@src.gnome.org> | 2008-05-18 12:50:34 +0000 |
|---|---|---|
| committer | Stefan Walter <stefw@src.gnome.org> | 2008-05-18 12:50:34 +0000 |
| commit | d7e6145f9eac6096b6a4aa48959647e8b9fbca2b (patch) | |
| tree | 72cea81b0b00cf3c1cfe2f1f32035724aedccc04 | |
| parent | 89e5f90159c080c3a6b50d4700254ac435c299ba (diff) | |
| download | gnome-keyring-d7e6145f9eac6096b6a4aa48959647e8b9fbca2b.tar.gz | |
Fix crash when HAL location volume is not registered for some reason.
* common/gkr-location.c: Fix crash when HAL location volume
is not registered for some reason. Fixes bug #530316
svn path=/trunk/; revision=1141
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | common/gkr-location.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2008-05-18 Stef Walter <stef@memberwebs.com> + + * common/gkr-location.c: Fix crash when HAL location volume + is not registered for some reason. Fixes bug #530316 + 2008-04-29 Stef Walter <stef@memberwebs.com> * pk/gkr-pk-object-storage.c: Return gboolean from parsed_* diff --git a/common/gkr-location.c b/common/gkr-location.c index 393a8d25..90340f31 100644 --- a/common/gkr-location.c +++ b/common/gkr-location.c @@ -320,8 +320,10 @@ hal_device_property (LibHalContext *hal_ctx, const char *udi, const char *key, g_message ("adding removable location: %s at %s", name, mount); gkr_location_manager_register (locmgr, name, mount, friendly); + locvol = g_hash_table_lookup (pv->volumes_by_name, name); - locvol->hal_volume = TRUE; + if (locvol) + locvol->hal_volume = TRUE; /* A mount was removed? */ } else if (!is_mounted && g_hash_table_lookup (pv->volumes_by_name, name)) { |