summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartyn Russell <martyn@lanedo.com>2010-02-26 10:25:21 +0000
committerArnel A. Borja <arnelborja@src.gnome.org>2013-08-31 00:56:42 +0800
commit43014e33fdd91a7f2adee5471bd2ced4cdc231a5 (patch)
treee06ad377783550f4e28dfd6591a3aa84cb5c3e72
parente75bb96a7e145ae5d294aa26919dbdd58e192de6 (diff)
downloadlibmediaart-43014e33fdd91a7f2adee5471bd2ced4cdc231a5.tar.gz
libtracker-miner: Fixed crash when starting tracker with CD/DVDs mounted
-rw-r--r--src/libtracker-miner/tracker-storage.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/libtracker-miner/tracker-storage.c b/src/libtracker-miner/tracker-storage.c
index a8f971c..6b587a6 100644
--- a/src/libtracker-miner/tracker-storage.c
+++ b/src/libtracker-miner/tracker-storage.c
@@ -346,6 +346,12 @@ volume_add (TrackerStorage *storage,
return;
}
+ uuid = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UUID);
+ if (!uuid) {
+ g_debug (" Ignoring, volume has no UUID");
+ return;
+ }
+
device_file = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
g_debug (" Device file : %s", device_file);
@@ -368,17 +374,15 @@ volume_add (TrackerStorage *storage,
is_mounted = FALSE;
}
- uuid = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UUID);
g_debug (" UUID : %s", uuid);
-
g_debug (" Mounted : %s", is_mounted ? "yes" : "no");
-
+
priv = TRACKER_STORAGE_GET_PRIVATE (storage);
if (mount_point && !g_hash_table_lookup (priv->mounts_by_uuid, uuid)) {
mount_add (storage, uuid, mount_point, TRUE);
}
-
+
g_free (uuid);
g_free (mount_point);
g_free (device_file);