Merge branch 'azzaronea/fix-issue-67'

17 files changed, 350 insertions, 99 deletions

diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index a474e18dc..d8b4ee50e 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -5012,6 +5012,7 @@ tracker_data_manager_finalize (GObject *object)
 
 	g_clear_object (&manager->ontologies);
 	g_clear_object (&manager->data_update);
+	g_free (manager->status);
 
 	G_OBJECT_CLASS (tracker_data_manager_parent_class)->finalize (object);
 }
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c
index a06b71d4a..0ff72dcae 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -1703,6 +1703,7 @@ tracker_db_interface_sqlite_fts_init (TrackerDBInterface  *db_interface,
 			                        fts_columns[i]);
 		}
 
+		g_free (db_interface->fts_properties);
 		db_interface->fts_properties = g_string_free (fts_properties,
 		                                              FALSE);
 		g_strfreev (fts_columns);
@@ -2267,6 +2268,7 @@ tracker_db_interface_create_statement (TrackerDBInterface           *db_interfac
 		                                                 error);
 		if (!sqlite_stmt) {
 			tracker_db_interface_unlock (db_interface);
+			g_free (full_query);
 			return NULL;
 		}
 
diff --git a/src/libtracker-data/tracker-db-journal.c b/src/libtracker-data/tracker-db-journal.c
index 1fa93793d..0c5711494 100644
--- a/src/libtracker-data/tracker-db-journal.c
+++ b/src/libtracker-data/tracker-db-journal.c
@@ -1780,10 +1780,11 @@ tracker_db_journal_reader_verify_last (GFile   *data_location,
 
 			jreader.current = jreader.end - entry_size_check;
 			success = db_journal_reader_next (&jreader, FALSE, NULL);
-			db_journal_reader_clear (&jreader);
 		} else {
 			success = TRUE;
 		}
+
+		db_journal_reader_clear (&jreader);
 	}
 
 	g_free (filename);
diff --git a/src/libtracker-data/tracker-sparql-grammar.h b/src/libtracker-data/tracker-sparql-grammar.h
index 75f5f801c..0a01c9066 100644
--- a/src/libtracker-data/tracker-sparql-grammar.h
+++ b/src/libtracker-data/tracker-sparql-grammar.h
@@ -790,7 +790,7 @@ static const TrackerGrammarRule helper_BuiltInCall_or_2[] = { S(helper_BuiltInCa
 						       S(helper_BuiltInCall_seq_47), S(helper_BuiltInCall_seq_48), S(helper_BuiltInCall_seq_49),
 						       S(helper_BuiltInCall_seq_50), S(helper_BuiltInCall_seq_51), S(helper_BuiltInCall_seq_52),
                                                        S(helper_BuiltInCall_seq_53), S(helper_BuiltInCall_seq_54), S(helper_BuiltInCall_seq_55),
-                                                       S(helper_BuiltInCall_seq_56)};
+                                                       S(helper_BuiltInCall_seq_56), NIL };
 static const TrackerGrammarRule rule_BuiltInCall[] = { OR(helper_BuiltInCall_or_2), NIL };
 
 /* BrackettedExpression ::= '(' Expression ')'
diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c
index f83f70df9..143c16298 100644
--- a/src/libtracker-data/tracker-sparql.c
+++ b/src/libtracker-data/tracker-sparql.c
@@ -270,8 +270,10 @@ tracker_sparql_expand_prefix (TrackerSparql *sparql,
 			g_hash_table_insert (sparql->prefix_map, g_strdup (ns), expanded_ns);
 		}
 
-		if (!expanded_ns)
+		if (!expanded_ns) {
+			g_free (ns);
 			return NULL;
+		}
 	}
 
 	g_free (ns);
@@ -4060,8 +4062,6 @@ translate_PathElt (TrackerSparql  *sparql,
 	/* PathElt ::= PathPrimary PathMod?
 	 */
 	_call_rule (sparql, NAMED_RULE_PathPrimary, error);
-	_init_token (&sparql->current_state.predicate,
-	             sparql->current_state.prev_node, sparql);
 
 	if (_check_in_rule (sparql, NAMED_RULE_PathMod)) {
 		_call_rule (sparql, NAMED_RULE_PathMod, error);
diff --git a/src/libtracker-data/tracker-turtle-reader.vala b/src/libtracker-data/tracker-turtle-reader.vala
index 5bebdc432..662ce8f43 100644
--- a/src/libtracker-data/tracker-turtle-reader.vala
+++ b/src/libtracker-data/tracker-turtle-reader.vala
@@ -17,6 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
+using GLib;
+
 public class Tracker.TurtleReader : Object {
 	SparqlScanner scanner;
 
@@ -56,8 +58,8 @@ public class Tracker.TurtleReader : Object {
 
 	HashTable<string,string> prefix_map;
 
-	string[] subject_stack;
-	string[] predicate_stack;
+	GLib.Queue<string> subject_stack;
+	GLib.Queue<string> predicate_stack;
 
 	int bnodeid = 0;
 	// base UUID used for blank nodes
@@ -88,6 +90,8 @@ public class Tracker.TurtleReader : Object {
 
 		tokens = new TokenInfo[BUFFER_SIZE];
 		prefix_map = new HashTable<string,string>.full (str_hash, str_equal, g_free, g_free);
+		subject_stack = new GLib.Queue<string> ();
+		predicate_stack = new GLib.Queue<string> ();
 	}
 
 	private string generate_bnodeid (string? user_bnodeid) {
@@ -266,8 +270,8 @@ public class Tracker.TurtleReader : Object {
 					return true;
 				} else if (accept (SparqlTokenType.OPEN_BRACKET)) {
 					// begin of anonymous blank node
-					subject_stack += subject;
-					predicate_stack += predicate;
+					subject_stack.push_tail (subject);
+					predicate_stack.push_tail (predicate);
 					subject = generate_bnodeid (null);
 					state = State.SUBJECT;
 					continue;
@@ -355,18 +359,15 @@ public class Tracker.TurtleReader : Object {
 					}
 					state = State.SUBJECT;
 					continue;
-				} else if (subject_stack.length > 0) {
+				} else if (!subject_stack.is_empty()) {
 					// end of anonymous blank node
 					expect (SparqlTokenType.CLOSE_BRACKET);
 
 					object = subject;
 					object_is_uri = true;
 
-					subject = subject_stack[subject_stack.length - 1];
-					subject_stack.length--;
-
-					predicate = predicate_stack[predicate_stack.length - 1];
-					predicate_stack.length--;
+					subject = subject_stack.pop_tail();
+					predicate = predicate_stack.pop_tail();
 
 					state = State.OBJECT;
 					return true;
diff --git a/src/libtracker-direct/tracker-direct.c b/src/libtracker-direct/tracker-direct.c
index 7d62c6f30..b9443900f 100644
--- a/src/libtracker-direct/tracker-direct.c
+++ b/src/libtracker-direct/tracker-direct.c
@@ -569,6 +569,7 @@ update_array_async_thread_func (GTask        *task,
 	tracker_sparql_connection_update (source_object, concatenated,
 	                                  g_task_get_priority (task),
 	                                  cancellable, &error);
+	g_free (concatenated);
 
 	if (!error) {
 		g_task_return_pointer (task, errors,
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index ccf85976e..26aa8b877 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -314,6 +314,7 @@ tracker_monitor_finalize (GObject *object)
 
 	g_hash_table_unref (priv->cached_events);
 	g_hash_table_unref (priv->monitors);
+	g_clear_object (&priv->tree);
 
 	G_OBJECT_CLASS (tracker_monitor_parent_class)->finalize (object);
 }
diff --git a/tests/libtracker-common/tracker-date-time-test.c b/tests/libtracker-common/tracker-date-time-test.c
index 40e141f70..7d4e78bb4 100644
--- a/tests/libtracker-common/tracker-date-time-test.c
+++ b/tests/libtracker-common/tracker-date-time-test.c
@@ -90,6 +90,10 @@ test_string_to_date (void)
 	g_assert_cmpint (g_date_get_day (expected), ==, g_date_get_day (result));
 	g_assert_cmpint (g_date_get_month (expected), ==, g_date_get_month (result));
 
+	g_date_free (expected);
+	g_date_free (result);
+
+
 	result_time_t = tracker_string_to_date ("", NULL, &error);
 	g_assert_cmpint (result_time_t, ==, -1);
 	g_assert_error (error, TRACKER_DATE_ERROR, TRACKER_DATE_ERROR_INVALID_ISO8601);
@@ -137,6 +141,9 @@ test_date_to_string (void)
 	result = tracker_date_to_string (input);
 
 	g_assert (result != NULL && strncmp (result, "2008-06-16T23:53:10Z", 19) == 0);
+
+	g_free (result);
+	g_free (original);
 }
 
 static void
diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c
index 5bf1c9ed4..66f9739fa 100644
--- a/tests/libtracker-common/tracker-file-utils-test.c
+++ b/tests/libtracker-common/tracker-file-utils-test.c
@@ -165,6 +165,7 @@ test_path_evaluate_name (void)
 
 	result = tracker_path_evaluate_name ("just-a-filename");
 	g_assert_cmpstr (result, ==, "just-a-filename");
+	g_free (result);
 
 	result = tracker_path_evaluate_name ("$HOME/all/dir/");
 	expected = g_build_path (G_DIR_SEPARATOR_S, home, "/all/dir", NULL);
@@ -200,21 +201,25 @@ test_path_evaluate_name (void)
 
 	result = tracker_path_evaluate_name ("");
 	g_assert (!result);
+	g_free (result);
 
 	result = tracker_path_evaluate_name (NULL);
 	g_assert (!result);
-
+	g_free (result);
 
         g_setenv ("HOME", "", TRUE);
         result = tracker_path_evaluate_name ("~/but-no-home.txt");
         g_assert (!result);
+        g_free (result);
         g_setenv ("HOME", home, TRUE);
 
         result = tracker_path_evaluate_name ("$UNDEFINED/something");
         g_assert_cmpstr (result, ==, "/something");
+        g_free (result);
 
 	result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
 	g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ());
+	g_free (result);
 
 	g_free (home);
 	g_free (pwd);
diff --git a/tests/libtracker-common/tracker-type-utils-test.c b/tests/libtracker-common/tracker-type-utils-test.c
index 808c78094..5fce83406 100644
--- a/tests/libtracker-common/tracker-type-utils-test.c
+++ b/tests/libtracker-common/tracker-type-utils-test.c
@@ -56,6 +56,7 @@ test_string_in_string_list (void)
 
 	g_assert_cmpint (tracker_string_in_string_list ("is", pieces), ==, 1);
 	g_assert_cmpint (tracker_string_in_string_list ("Audio:Title", pieces), ==, 12);
+	g_strfreev (pieces);
 
 	g_assert_cmpint (tracker_string_in_string_list ("terms", NULL), ==, -1);
 }
@@ -143,6 +144,7 @@ test_string_to_string_list (void)
         result = tracker_string_to_string_list (input);
         g_assert_cmpint (g_strv_length (result), ==, 1);
         g_assert_cmpstr (result [0], ==, "first line");
+        g_strfreev (result);
 }
 
 static void
diff --git a/tests/libtracker-data/tracker-backup-test.c b/tests/libtracker-data/tracker-backup-test.c
index d38fb235b..dd3a9d998 100644
--- a/tests/libtracker-data/tracker-backup-test.c
+++ b/tests/libtracker-data/tracker-backup-test.c
@@ -216,6 +216,8 @@ test_backup_and_restore_helper (const gchar *db_location,
 
 	g_assert_cmpint (backup_calls, ==, 1);
 
+	g_free (data_prefix);
+	g_object_unref (data_location);
 	g_object_unref (manager);
 }
 
diff --git a/tests/libtracker-data/tracker-ontology-change-test.c b/tests/libtracker-data/tracker-ontology-change-test.c
index b0e6aac22..190386f2a 100644
--- a/tests/libtracker-data/tracker-ontology-change-test.c
+++ b/tests/libtracker-data/tracker-ontology-change-test.c
@@ -284,6 +284,7 @@ test_ontology_change (void)
 	g_free (ontologies);
 	g_free (build_prefix);
 	g_free (prefix);
+	g_free (ontology_file);
 }
 
 int
diff --git a/tests/libtracker-miner/tracker-file-notifier-test.c b/tests/libtracker-miner/tracker-file-notifier-test.c
index 00da7c7bf..e195104b0 100644
--- a/tests/libtracker-miner/tracker-file-notifier-test.c
+++ b/tests/libtracker-miner/tracker-file-notifier-test.c
@@ -321,13 +321,14 @@ test_common_context_teardown (TestCommonContext *fixture,
 		g_object_unref (fixture->test_file);
 	}
 
+	DELETE_FOLDER (fixture, NULL);
+
 	if (fixture->test_path) {
 		g_free (fixture->test_path);
 	}
 
 	g_clear_object (&fixture->connection);
-
-	DELETE_FOLDER (fixture, NULL);
+	g_main_loop_unref (fixture->main_loop);
 }
 
 static gboolean
diff --git a/tests/libtracker-miner/tracker-miner-fs-test.c b/tests/libtracker-miner/tracker-miner-fs-test.c
index 17769f37d..c57579b27 100644
--- a/tests/libtracker-miner/tracker-miner-fs-test.c
+++ b/tests/libtracker-miner/tracker-miner-fs-test.c
@@ -45,11 +45,12 @@ test_miner_process_file (TrackerMinerFS *miner,
 	info = g_file_query_info (file, "standard::*,time::*", 0, NULL, &error);
 	g_assert_no_error (error);
 
-	if (g_strcmp0 (tracker_miner_fs_get_urn (miner, file),
-	               tracker_miner_fs_query_urn (miner, file)) != 0) {
+	urn = tracker_miner_fs_query_urn (miner, file);
+	if (g_strcmp0 (tracker_miner_fs_get_urn (miner, file), urn) != 0) {
 		g_critical ("File %s did not get up to date URN",
 		            g_file_get_uri (file));
 	}
+	g_free (urn);
 
 	resource = tracker_resource_new (tracker_miner_fs_get_urn (miner, file));
 
@@ -81,6 +82,7 @@ test_miner_process_file (TrackerMinerFS *miner,
 	tracker_miner_fs_notify_finish (miner, task, sparql, NULL);
 	g_object_unref (resource);
 	g_free (sparql);
+	g_object_unref (info);
 
 	return TRUE;
 }
@@ -412,6 +414,8 @@ static void
 test_recursive_indexing (TrackerMinerFSTestFixture *fixture,
                          gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/1");
 	CREATE_FOLDER (fixture, "recursive/1/2");
@@ -427,7 +431,8 @@ test_recursive_indexing (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1,"
 	                 "recursive/1/2,"
@@ -435,12 +440,15 @@ test_recursive_indexing (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/1/a,"
 	                 "recursive/1/b,"
 	                 "recursive/1/empty");
+	g_free (content);
 }
 
 static void
 test_non_recursive_indexing (TrackerMinerFSTestFixture *fixture,
                              gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "non-recursive");
 	CREATE_FOLDER (fixture, "non-recursive/1");
 	CREATE_FOLDER (fixture, "non-recursive/1/2");
@@ -455,17 +463,21 @@ test_non_recursive_indexing (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/1,"
 	                 "non-recursive/a,"
 	                 "non-recursive/empty");
+	g_free (content);
 }
 
 static void
 test_separate_recursive_and_non_recursive (TrackerMinerFSTestFixture *fixture,
                                            gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/1");
 	CREATE_FOLDER (fixture, "recursive/1/2");
@@ -487,7 +499,8 @@ test_separate_recursive_and_non_recursive (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/1,"
 	                 "non-recursive/a,"
@@ -496,12 +509,15 @@ test_separate_recursive_and_non_recursive (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/1/2,"
 	                 "recursive/1/b,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
 test_recursive_in_non_recursive (TrackerMinerFSTestFixture *fixture,
                                  gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "non-recursive");
 	CREATE_FOLDER (fixture, "non-recursive/1");
 	CREATE_FOLDER (fixture, "non-recursive/1/recursive");
@@ -521,7 +537,8 @@ test_recursive_in_non_recursive (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/1,"
 	                 "non-recursive/1/recursive,"
@@ -529,12 +546,15 @@ test_recursive_in_non_recursive (TrackerMinerFSTestFixture *fixture,
 	                 "non-recursive/1/recursive/2/d,"
 	                 "non-recursive/1/recursive/c,"
 	                 "non-recursive/a");
+	g_free (content);
 }
 
 static void
 test_non_recursive_in_recursive (TrackerMinerFSTestFixture *fixture,
                                  gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/1");
 	CREATE_FOLDER (fixture, "recursive/1/non-recursive");
@@ -554,7 +574,8 @@ test_non_recursive_in_recursive (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1,"
 	                 "recursive/1/b,"
@@ -562,12 +583,15 @@ test_non_recursive_in_recursive (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/1/non-recursive/2,"
 	                 "recursive/1/non-recursive/c,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
 test_empty_root (TrackerMinerFSTestFixture *fixture,
                  gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "empty");
 
 	fixture_add_indexed_folder (fixture, "empty",
@@ -578,13 +602,17 @@ test_empty_root (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==, "empty");
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==, "empty");
+	g_free (content);
 }
 
 static void
 test_missing_root (TrackerMinerFSTestFixture *fixture,
                    gconstpointer              data)
 {
+	gchar *content;
+
 	fixture_add_indexed_folder (fixture, "missing",
 	                            TRACKER_DIRECTORY_FLAG_CHECK_MTIME |
 	                            TRACKER_DIRECTORY_FLAG_RECURSE);
@@ -593,7 +621,9 @@ test_missing_root (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==, "");
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==, "");
+	g_free (content);
 }
 
 static void
@@ -601,6 +631,7 @@ test_skip_hidden_files (TrackerMinerFSTestFixture *fixture,
                         gconstpointer              data)
 {
 	TrackerIndexingTree *indexing_tree;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/1");
@@ -620,15 +651,19 @@ test_skip_hidden_files (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1");
+	g_free (content);
 }
 
 static void
 test_index_hidden_files (TrackerMinerFSTestFixture *fixture,
                          gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/1");
 	CREATE_FOLDER (fixture, "recursive/1/.hidden");
@@ -644,13 +679,15 @@ test_index_hidden_files (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/.hidden-file,"
 	                 "recursive/1,"
 	                 "recursive/1/.hidden,"
 	                 "recursive/1/.hidden/2,"
 	                 "recursive/1/.hidden/2/a");
+	g_free (content);
 }
 
 static void
@@ -658,6 +695,7 @@ test_file_filter_default_accept (TrackerMinerFSTestFixture *fixture,
                                  gconstpointer              data)
 {
 	TrackerIndexingTree *indexing_tree;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/aa");
@@ -681,12 +719,14 @@ test_file_filter_default_accept (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/aa,"
 	                 "recursive/aa/b2,"
 	                 "recursive/bb,"
 	                 "recursive/bb/bb");
+	g_free (content);
 }
 
 static void
@@ -694,6 +734,7 @@ test_file_filter_default_deny (TrackerMinerFSTestFixture *fixture,
                                gconstpointer              data)
 {
 	TrackerIndexingTree *indexing_tree;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/aa");
@@ -717,12 +758,14 @@ test_file_filter_default_deny (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/aa,"
 	                 "recursive/aa/a1,"
 	                 "recursive/bb,"
 	                 "recursive/bb/ab");
+	g_free (content);
 }
 
 static void
@@ -730,6 +773,7 @@ test_directory_filter_default_accept (TrackerMinerFSTestFixture *fixture,
                                       gconstpointer              data)
 {
 	TrackerIndexingTree *indexing_tree;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/aa");
@@ -753,11 +797,13 @@ test_directory_filter_default_accept (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/bb,"
 	                 "recursive/bb/ab,"
 	                 "recursive/bb/bb");
+	g_free (content);
 }
 
 static void
@@ -765,6 +811,7 @@ test_directory_filter_default_deny (TrackerMinerFSTestFixture *fixture,
                                       gconstpointer              data)
 {
 	TrackerIndexingTree *indexing_tree;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/aa");
@@ -791,11 +838,13 @@ test_directory_filter_default_deny (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/aa,"
 	                 "recursive/aa/a1,"
 	                 "recursive/aa/b2");
+	g_free (content);
 }
 
 static void
@@ -803,6 +852,7 @@ test_content_filter_default_accept (TrackerMinerFSTestFixture *fixture,
                                     gconstpointer              data)
 {
 	TrackerIndexingTree *indexing_tree;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/aa");
@@ -828,12 +878,14 @@ test_content_filter_default_accept (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/aa,"
 	                 "recursive/bb,"
 	                 "recursive/bb/ab,"
 	                 "recursive/bb/bb");
+	g_free (content);
 }
 
 static void
@@ -841,6 +893,7 @@ test_content_filter_default_deny (TrackerMinerFSTestFixture *fixture,
                                   gconstpointer              data)
 {
 	TrackerIndexingTree *indexing_tree;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/aa");
@@ -867,7 +920,8 @@ test_content_filter_default_deny (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/aa,"
 	                 "recursive/aa/a1,"
@@ -875,6 +929,7 @@ test_content_filter_default_deny (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/aa/b2,"
 	                 "recursive/allow,"
 	                 "recursive/bb");
+	g_free (content);
 }
 
 static void
@@ -882,6 +937,7 @@ test_content_filter_on_parent_root (TrackerMinerFSTestFixture *fixture,
 				    gconstpointer              data)
 {
 	TrackerIndexingTree *indexing_tree;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "non-recursive");
 	CREATE_FOLDER (fixture, "non-recursive/recursive");
@@ -909,12 +965,14 @@ test_content_filter_on_parent_root (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/recursive,"
 			 "non-recursive/recursive/a,"
 			 "non-recursive/recursive/a/d,"
 			 "non-recursive/recursive/c");
+	g_free (content);
 
 	/* Check it is ok after the content is already indexed. All
 	 * files should stay and no events should be generated as
@@ -936,12 +994,14 @@ test_content_filter_on_parent_root (TrackerMinerFSTestFixture *fixture,
 	test_miner_reset_counters ((TestMiner *) fixture->miner);
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/recursive,"
 			 "non-recursive/recursive/a,"
 			 "non-recursive/recursive/a/d,"
 			 "non-recursive/recursive/c");
+	g_free (content);
 
 	g_assert_cmpint (((TestMiner *) fixture->miner)->n_events, ==, 0);
 }
@@ -950,6 +1010,8 @@ static void
 test_non_monitored_create (TrackerMinerFSTestFixture *fixture,
                            gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -962,9 +1024,11 @@ test_non_monitored_create (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	fixture_remove_indexed_folder (fixture, "recursive");
 
@@ -978,18 +1042,22 @@ test_non_monitored_create (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a,"
 	                 "recursive/b,"
 	                 "recursive/new,"
 	                 "recursive/new/c");
+	g_free (content);
 }
 
 static void
 test_non_monitored_update (TrackerMinerFSTestFixture *fixture,
                            gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1002,9 +1070,11 @@ test_non_monitored_update (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	fixture_remove_indexed_folder (fixture, "recursive");
 	test_miner_reset_counters ((TestMiner *) fixture->miner);
@@ -1022,15 +1092,19 @@ test_non_monitored_update (TrackerMinerFSTestFixture *fixture,
 
 	g_assert_cmpint (((TestMiner *) fixture->miner)->n_process_file, >=, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
 test_non_monitored_delete (TrackerMinerFSTestFixture *fixture,
                            gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/1");
 	CREATE_FOLDER (fixture, "recursive/1/2");
@@ -1049,7 +1123,8 @@ test_non_monitored_delete (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1,"
 	                 "recursive/1/2,"
@@ -1057,6 +1132,7 @@ test_non_monitored_delete (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/1/2/3/c,"
 	                 "recursive/1/2/b,"
 	                 "recursive/a");
+	g_free (content);
 
 	fixture_remove_indexed_folder (fixture, "recursive");
 
@@ -1070,15 +1146,19 @@ test_non_monitored_delete (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1");
+	g_free (content);
 }
 
 static void
 test_non_monitored_move (TrackerMinerFSTestFixture *fixture,
                          gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/1");
 	CREATE_FOLDER (fixture, "non-recursive");
@@ -1103,7 +1183,8 @@ test_non_monitored_move (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/2,"
 	                 "recursive,"
@@ -1111,6 +1192,7 @@ test_non_monitored_move (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/1/b,"
 	                 "recursive/a,"
 	                 "recursive/d");
+	g_free (content);
 
 	fixture_remove_indexed_folder (fixture, "recursive");
 	fixture_remove_indexed_folder (fixture, "non-recursive");
@@ -1130,19 +1212,23 @@ test_non_monitored_move (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/3,"
 	                 "non-recursive/e,"
 	                 "recursive,"
 	                 "recursive/4,"
 	                 "recursive/4/c");
+	g_free (content);
 }
 
 static void
 test_monitored_create (TrackerMinerFSTestFixture *fixture,
                        gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1155,9 +1241,11 @@ test_monitored_create (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	CREATE_FOLDER (fixture, "recursive/new");
 	CREATE_UPDATE_FILE (fixture, "recursive/b");
@@ -1165,18 +1253,22 @@ test_monitored_create (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a,"
 	                 "recursive/b,"
 	                 "recursive/new,"
 	                 "recursive/new/c");
+	g_free (content);
 }
 
 static void
 test_monitored_update (TrackerMinerFSTestFixture *fixture,
                        gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1189,9 +1281,11 @@ test_monitored_update (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	test_miner_reset_counters ((TestMiner *) fixture->miner);
 
@@ -1201,15 +1295,18 @@ test_monitored_update (TrackerMinerFSTestFixture *fixture,
 
 	g_assert_cmpint (((TestMiner *) fixture->miner)->n_process_file, ==, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
 test_monitored_delete (TrackerMinerFSTestFixture *fixture,
                        gconstpointer              data)
 {
+	gchar *content;
 	gint n_tries = 0;
 
 	CREATE_FOLDER (fixture, "recursive");
@@ -1230,7 +1327,8 @@ test_monitored_delete (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1,"
 	                 "recursive/1/2,"
@@ -1238,6 +1336,7 @@ test_monitored_delete (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/1/2/3/c,"
 	                 "recursive/1/2/b,"
 	                 "recursive/a");
+	g_free (content);
 
 	DELETE_FOLDER (fixture, "recursive/1/2");
 
@@ -1251,24 +1350,29 @@ test_monitored_delete (TrackerMinerFSTestFixture *fixture,
 		n_tries++;
 	}
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1,"
 	                 "recursive/a");
+	g_free (content);
 
 	DELETE_FILE (fixture, "recursive/a");
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1");
+	g_free (content);
 }
 
 static void
 test_monitored_move (TrackerMinerFSTestFixture *fixture,
                      gconstpointer              data)
 {
+	gchar *content;
 	gint n_tries = 0;
 
 	CREATE_FOLDER (fixture, "recursive");
@@ -1295,7 +1399,8 @@ test_monitored_move (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/2,"
 	                 "recursive,"
@@ -1303,6 +1408,7 @@ test_monitored_move (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/1/b,"
 	                 "recursive/a,"
 	                 "recursive/d");
+	g_free (content);
 
 	MOVE_FILE (fixture, "recursive/a", "non-recursive/e");
 	MOVE_FILE (fixture, "recursive/1", "non-recursive/3");
@@ -1315,19 +1421,23 @@ test_monitored_move (TrackerMinerFSTestFixture *fixture,
 		n_tries++;
 	}
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "non-recursive,"
 	                 "non-recursive/3,"
 	                 "non-recursive/e,"
 	                 "recursive,"
 	                 "recursive/4,"
 	                 "recursive/4/c");
+	g_free (content);
 }
 
 static void
 test_monitored_atomic_replace (TrackerMinerFSTestFixture *fixture,
                                gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1341,23 +1451,29 @@ test_monitored_atomic_replace (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	UPDATE_FILE_ATOMIC (fixture, "recursive/a", "recursive/b");
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
 test_changes_after_no_mtime_check (TrackerMinerFSTestFixture *fixture,
                                    gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "recursive/1");
 	CREATE_FOLDER (fixture, "recursive/1/2");
@@ -1374,12 +1490,14 @@ test_changes_after_no_mtime_check (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1,"
 	                 "recursive/1/2,"
 	                 "recursive/1/2/b,"
 	                 "recursive/a");
+	g_free (content);
 
 	fixture_remove_indexed_folder (fixture, "recursive");
 
@@ -1392,12 +1510,14 @@ test_changes_after_no_mtime_check (TrackerMinerFSTestFixture *fixture,
 	                            TRACKER_DIRECTORY_FLAG_RECURSE);
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1,"
 	                 "recursive/1/2,"
 	                 "recursive/1/2/b,"
 	                 "recursive/a");
+	g_free (content);
 
 	CREATE_UPDATE_FILE (fixture, "recursive/1/3/c");
 	CREATE_UPDATE_FILE (fixture, "recursive/1/2");
@@ -1406,7 +1526,8 @@ test_changes_after_no_mtime_check (TrackerMinerFSTestFixture *fixture,
 	while (!fixture_query_exists (fixture, "recursive/c"))
 		fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/1,"
 	                 "recursive/1/2,"
@@ -1415,12 +1536,15 @@ test_changes_after_no_mtime_check (TrackerMinerFSTestFixture *fixture,
 	                 "recursive/1/3/c,"
 	                 "recursive/a,"
 	                 "recursive/c");
+	g_free (content);
 }
 
 static void
 test_event_queue_create_and_update (TrackerMinerFSTestFixture *fixture,
                                     gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 
 	fixture_add_indexed_folder (fixture, "recursive",
@@ -1432,7 +1556,9 @@ test_event_queue_create_and_update (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==, "recursive");
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==, "recursive");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1441,23 +1567,28 @@ test_event_queue_create_and_update (TrackerMinerFSTestFixture *fixture,
 	UPDATE_FILE_ATOMIC (fixture, "recursive/a", "recursive/b");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
-	                 "recursive");
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==, "recursive");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	g_assert_cmpint (((TestMiner *) fixture->miner)->n_process_file, ==, 1);
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
 test_event_queue_create_and_delete (TrackerMinerFSTestFixture *fixture,
                                     gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 
 	fixture_add_indexed_folder (fixture, "recursive",
@@ -1469,7 +1600,9 @@ test_event_queue_create_and_delete (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==, "recursive");
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==, "recursive");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1489,6 +1622,8 @@ static void
 test_event_queue_create_and_move (TrackerMinerFSTestFixture *fixture,
                                   gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 
 	fixture_add_indexed_folder (fixture, "recursive",
@@ -1500,7 +1635,9 @@ test_event_queue_create_and_move (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==, "recursive");
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==, "recursive");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1509,22 +1646,27 @@ test_event_queue_create_and_move (TrackerMinerFSTestFixture *fixture,
 	MOVE_FILE (fixture, "recursive/a", "recursive/b");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
-	                 "recursive");
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==, "recursive");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/b");
+	g_free (content);
 }
 
 static void
 test_event_queue_update_and_update (TrackerMinerFSTestFixture *fixture,
                                     gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1537,9 +1679,11 @@ test_event_queue_update_and_update (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 	test_miner_reset_counters ((TestMiner *) fixture->miner);
@@ -1550,9 +1694,11 @@ test_event_queue_update_and_update (TrackerMinerFSTestFixture *fixture,
 	MOVE_FILE (fixture, "b", "recursive/a");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
@@ -1560,15 +1706,19 @@ test_event_queue_update_and_update (TrackerMinerFSTestFixture *fixture,
 	/* Coalescing desirable, but not mandatory */
 	g_assert_cmpint (((TestMiner *) fixture->miner)->n_process_file, >=, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
 test_event_queue_update_and_delete (TrackerMinerFSTestFixture *fixture,
                                     gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1581,9 +1731,11 @@ test_event_queue_update_and_delete (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1592,22 +1744,27 @@ test_event_queue_update_and_delete (TrackerMinerFSTestFixture *fixture,
 	DELETE_FILE (fixture, "recursive/a");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
-	                 "recursive");
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==, "recursive");
+	g_free (content);
 }
 
 static void
 test_event_queue_update_and_move (TrackerMinerFSTestFixture *fixture,
                                   gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1620,9 +1777,11 @@ test_event_queue_update_and_move (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1632,23 +1791,29 @@ test_event_queue_update_and_move (TrackerMinerFSTestFixture *fixture,
 	MOVE_FILE (fixture, "recursive/a", "recursive/b");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/b");
+	g_free (content);
 }
 
 static void
 test_event_queue_delete_and_create (TrackerMinerFSTestFixture *fixture,
                                     gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1661,9 +1826,11 @@ test_event_queue_delete_and_create (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1672,23 +1839,29 @@ test_event_queue_delete_and_create (TrackerMinerFSTestFixture *fixture,
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
 test_event_queue_move_and_update (TrackerMinerFSTestFixture *fixture,
                                   gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1701,9 +1874,11 @@ test_event_queue_move_and_update (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1714,24 +1889,30 @@ test_event_queue_move_and_update (TrackerMinerFSTestFixture *fixture,
 	UPDATE_FILE_ATOMIC (fixture, "recursive/b", "c");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 	g_assert_cmpint (((TestMiner *) fixture->miner)->n_process_file, ==, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/b");
+	g_free (content);
 }
 
 static void
 test_event_queue_move_and_create_origin (TrackerMinerFSTestFixture *fixture,
                                          gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1744,9 +1925,11 @@ test_event_queue_move_and_create_origin (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1755,24 +1938,30 @@ test_event_queue_move_and_create_origin (TrackerMinerFSTestFixture *fixture,
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a,"
 	                 "recursive/b");
+	g_free (content);
 }
 
 static void
 test_event_queue_move_and_delete (TrackerMinerFSTestFixture *fixture,
                                   gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1785,9 +1974,11 @@ test_event_queue_move_and_delete (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1796,22 +1987,28 @@ test_event_queue_move_and_delete (TrackerMinerFSTestFixture *fixture,
 	DELETE_FILE (fixture, "recursive/b");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive");
+	g_free (content);
 }
 
 static void
 test_event_queue_move_and_move (TrackerMinerFSTestFixture *fixture,
                                 gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1824,9 +2021,11 @@ test_event_queue_move_and_move (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1835,23 +2034,29 @@ test_event_queue_move_and_move (TrackerMinerFSTestFixture *fixture,
 	MOVE_FILE (fixture, "recursive/b", "recursive/c");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/c");
+	g_free (content);
 }
 
 static void
 test_event_queue_move_and_move_back (TrackerMinerFSTestFixture *fixture,
                                      gconstpointer              data)
 {
+	gchar *content;
+
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_UPDATE_FILE (fixture, "recursive/a");
 
@@ -1864,9 +2069,11 @@ test_event_queue_move_and_move_back (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_pause (TRACKER_MINER (fixture->miner));
 
@@ -1875,17 +2082,21 @@ test_event_queue_move_and_move_back (TrackerMinerFSTestFixture *fixture,
 	MOVE_FILE (fixture, "recursive/b", "recursive/a");
 	fixture_iterate_filter (fixture, 1);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	tracker_miner_resume (TRACKER_MINER (fixture->miner));
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 static void
@@ -1893,6 +2104,7 @@ test_api_check_file (TrackerMinerFSTestFixture *fixture,
                      gconstpointer              data)
 {
 	GFile *file;
+	gchar *content;
 
 	CREATE_FOLDER (fixture, "recursive");
 	CREATE_FOLDER (fixture, "not-indexed");
@@ -1909,9 +2121,11 @@ test_api_check_file (TrackerMinerFSTestFixture *fixture,
 
 	fixture_iterate (fixture);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 
 	test_miner_reset_counters ((TestMiner *) fixture->miner);
 
@@ -1931,10 +2145,12 @@ test_api_check_file (TrackerMinerFSTestFixture *fixture,
 
 	g_assert_cmpint (((TestMiner *) fixture->miner)->n_process_file, ==, 2);
 
-	g_assert_cmpstr (fixture_get_content (fixture), ==,
+	content = fixture_get_content (fixture);
+	g_assert_cmpstr (content, ==,
 	                 "not-indexed/b,"
 	                 "recursive,"
 	                 "recursive/a");
+	g_free (content);
 }
 
 gint
diff --git a/tests/libtracker-miner/tracker-priority-queue-test.c b/tests/libtracker-miner/tracker-priority-queue-test.c
index a32d0fb81..2d5c6333c 100644
--- a/tests/libtracker-miner/tracker-priority-queue-test.c
+++ b/tests/libtracker-miner/tracker-priority-queue-test.c
@@ -130,6 +130,11 @@ test_priority_queue_find (void)
         g_assert_cmpstr (result, !=, NULL);
         g_assert_cmpint (priority, ==, 10);
 
+        while (!tracker_priority_queue_is_empty (queue)) {
+                gchar *text = (gchar *) tracker_priority_queue_pop (queue, NULL);
+                g_free (text);
+        }
+
         tracker_priority_queue_unref (queue);
 }
 
@@ -157,6 +162,11 @@ test_priority_queue_foreach (void)
 
         g_assert_cmpint (counter, ==, 3);
 
+        while (!tracker_priority_queue_is_empty (queue)) {
+                gchar *text = (gchar *) tracker_priority_queue_pop (queue, NULL);
+                g_free (text);
+        }
+
         tracker_priority_queue_unref (queue);
 }
 
diff --git a/tests/libtracker-sparql/tracker-resource-test.c b/tests/libtracker-sparql/tracker-resource-test.c
index 4c86fe865..4b616b947 100644
--- a/tests/libtracker-sparql/tracker-resource-test.c
+++ b/tests/libtracker-sparql/tracker-resource-test.c
@@ -73,7 +73,7 @@ test_resource_get_set_gvalue (void)
 	resource = tracker_resource_new ("http://example.com/resource");
 
 	g_value_init (&value, G_TYPE_STRING);
-	g_value_set_string (&value, "xyzzy");
+	g_value_set_static_string (&value, "xyzzy");
 	tracker_resource_set_gvalue (resource, "http://example.com/0", &value);
 
 	list = tracker_resource_get_values (resource, "http://example.com/0");