[gvfs] Bug 591808 – Proxy monitor code crashes when volume has no HAL UDI



commit 06bb4ae4796719b46e67f089fab9d18e82e47e23
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Aug 14 15:29:30 2009 +0100

    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.

 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 20de42d..17f5e75 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,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]