[gvfs] Bug 582772 – gvfsd-computer crashes with SEGSEV in recompute_files



commit 5d3ab40b5b0a574f207e7177d2f4c3bd329458a4
Author: David Zeuthen <davidz redhat com>
Date:   Tue Jun 16 17:41:45 2009 -0400

    Bug 582772 â?? gvfsd-computer crashes with SEGSEV in recompute_files
    
    Never use blank/empty drive names.

 monitor/gdu/ggdudrive.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 8e04104..6195f97 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -177,6 +177,15 @@ update_drive (GGduDrive *drive)
   if (device != NULL)
     g_object_unref (device);
 
+  /* Never use empty/blank names (#582772) */
+  if (drive->name == NULL || strlen (drive->name) == 0)
+    {
+      if (drive->device_file != NULL)
+        drive->name = g_strdup_printf (_("Unnamed Drive (%s)"), drive->device_file);
+      else
+        drive->name = g_strdup (_("Unnamed Drive"));
+    }
+
   /* compute whether something changed */
   changed = !((old_is_media_removable == drive->is_media_removable) &&
               (old_has_media == drive->has_media) &&



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