diff options
| author | Bastien Nocera <hadess@hadess.net> | 2009-08-14 15:29:30 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2009-08-14 15:29:30 +0100 |
| commit | 06bb4ae4796719b46e67f089fab9d18e82e47e23 (patch) | |
| tree | 66d3b58a89314f8ef2a84e1dc004de59ddd86ae7 /monitor/proxy | |
| parent | 1d28269cc6d9151786ea8d0d1790f48ab138ba34 (diff) | |
| download | gvfs-06bb4ae4796719b46e67f089fab9d18e82e47e23.tar.gz | |
Bug 591808 – Proxy monitor code crashes when volume has no HAL UDI
D-Bus doesn't like NULL strings, and the proxy code will
crash if we don't have a HAL UDI.
Diffstat (limited to 'monitor/proxy')
| -rw-r--r-- | monitor/proxy/gvfsproxyvolumemonitordaemon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/monitor/proxy/gvfsproxyvolumemonitordaemon.c b/monitor/proxy/gvfsproxyvolumemonitordaemon.c index 20de42d7..17f5e75c 100644 --- a/monitor/proxy/gvfsproxyvolumemonitordaemon.c +++ b/monitor/proxy/gvfsproxyvolumemonitordaemon.c @@ -599,6 +599,8 @@ append_volume (GVolume *volume, DBusMessageIter *iter_array) DBusMessageIter iter_dict_entry; char *id_value; id_value = g_volume_get_identifier (volume, identifiers[n]); + if (id_value == NULL) + continue; dbus_message_iter_open_container (&iter_identifiers, DBUS_TYPE_DICT_ENTRY, NULL, |