tracker r3125 - in trunk: . src/trackerd

[mr svn gnome org]

Author: mr
Date: Mon Mar 23 17:33:41 2009
New Revision: 3125
URL: http://svn.gnome.org/viewvc/tracker?rev=3125&view=rev

Log:
	* src/trackerd/tracker-processor.c: (get_remote_roots),
	(process_module_files_add_removable_media), (crawler_finished_cb),
	(mount_point_added_cb), (mount_point_removed_cb): Make use of
	g_strcmp0() so we don't crash with NULL strings as reported in
	LP#347352.


Modified:
   trunk/ChangeLog
   trunk/src/trackerd/tracker-processor.c

Modified: trunk/src/trackerd/tracker-processor.c
==============================================================================
--- trunk/src/trackerd/tracker-processor.c	(original)
+++ trunk/src/trackerd/tracker-processor.c	Mon Mar 23 17:33:41 2009
@@ -379,7 +379,7 @@
 		GList *list = NULL;
 
 		for (l = l1; l; l = l->next) {
-			if (g_list_find_custom (l2, l->data, (GCompareFunc) strcmp)) {
+			if (g_list_find_custom (l2, l->data, (GCompareFunc) g_strcmp0)) {
 				continue;
 			}
 
@@ -835,7 +835,7 @@
 		/* Don't iterate a device we have already crawled. */
 		if (g_list_find_custom (processor->private->removable_devices_completed, 
 					root, 
-					(GCompareFunc) strcmp)) {
+					(GCompareFunc) g_strcmp0)) {
 			continue;
 		}
 
@@ -1505,7 +1505,7 @@
 		 */
 		if (!g_list_find_custom (processor->private->removable_devices_completed, 
 					 root, 
-					 (GCompareFunc) strcmp)) {
+					 (GCompareFunc) g_strcmp0)) {
 			processor->private->removable_devices_completed = 
 				g_list_append (processor->private->removable_devices_completed, 
 					       g_strdup (root));
@@ -1541,7 +1541,7 @@
 	/* Remove from completed list so we don't ignore it */
 	l = g_list_find_custom (priv->removable_devices_completed, 
 				mount_point,
-				(GCompareFunc) strcmp);
+				(GCompareFunc) g_strcmp0);
 
 	if (l) {
 		g_free (l->data);
@@ -1585,7 +1585,7 @@
 	 */
 	l = g_list_find_custom (priv->removable_devices, 
 				mount_point,
-				(GCompareFunc) strcmp);
+				(GCompareFunc) g_strcmp0);
 
 	if (l) {
 		g_free (l->data);
@@ -1595,7 +1595,7 @@
 
 	l = g_list_find_custom (priv->removable_devices_completed, 
 				mount_point,
-				(GCompareFunc) strcmp);
+				(GCompareFunc) g_strcmp0);
 
 	if (l) {
 		g_free (l->data);