tracker r1164 - in trunk: . src/trackerd

[carlosg svn gnome org]

Author: carlosg
Date: Tue Feb 26 21:07:07 2008
New Revision: 1164
URL: http://svn.gnome.org/viewvc/tracker?rev=1164&view=rev

Log:
2008-02-26 Carlos Garnacho  <carlos imendio com>

        * src/trackerd/tracker-db-sqlite.c (sqlite3_get_service_name):
        * src/trackerd/tracker-dbus-metadata.c
        (tracker_dbus_method_metadata_set) (tracker_dbus_method_metadata_get):
        * src/trackerd/tracker-dbus-search.c
        (tracker_dbus_method_search_get_hit_count_all)
        (tracker_dbus_method_search_text_detailed): Plug some leaks. Fixes
        #518882.


Modified:
   trunk/ChangeLog
   trunk/src/trackerd/tracker-db-sqlite.c
   trunk/src/trackerd/tracker-dbus-metadata.c
   trunk/src/trackerd/tracker-dbus-search.c

Modified: trunk/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- trunk/src/trackerd/tracker-db-sqlite.c	(original)
+++ trunk/src/trackerd/tracker-db-sqlite.c	Tue Feb 26 21:07:07 2008
@@ -188,8 +188,7 @@
 			char *output;
 
 			output = tracker_get_service_by_id (sqlite3_value_int (argv[0]));
-			sqlite3_result_text (context, output, strlen (output), NULL);
-
+			sqlite3_result_text (context, output, strlen (output), g_free);
 		}
 	}
 }

Modified: trunk/src/trackerd/tracker-dbus-metadata.c
==============================================================================
--- trunk/src/trackerd/tracker-dbus-metadata.c	(original)
+++ trunk/src/trackerd/tracker-dbus-metadata.c	Tue Feb 26 21:07:07 2008
@@ -110,6 +110,8 @@
 	}
 
 	g_free (id);
+	dbus_free_string_array (keys);
+	dbus_free_string_array (values);
 
 	reply = dbus_message_new_method_return (rec->message);
 
@@ -205,14 +207,17 @@
 		if (field->needs_join) {
 			g_string_append_printf (sql_join, "\n LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ", field->table_name, field->alias, field->alias, field->alias, field->id_field);
 		}
-			
 
+		tracker_free_metadata_field (field);
 	}
 
 	g_string_append (sql, sql_join->str);
 
 	g_string_free (sql_join, TRUE);
 
+	dbus_free_string_array (keys);
+	g_free (res_service);
+
 	/* build WHERE clause */
 
 	g_string_append_printf (sql, " WHERE S.ID = %s", id );

Modified: trunk/src/trackerd/tracker-dbus-search.c
==============================================================================
--- trunk/src/trackerd/tracker-dbus-search.c	(original)
+++ trunk/src/trackerd/tracker-dbus-search.c	Tue Feb 26 21:07:07 2008
@@ -195,6 +195,8 @@
 	tracker_free_query (query);	
 
 	tracker_dbus_reply_with_query_result (rec, res);
+
+	tracker_db_free_result (res);
 }
 
 
@@ -389,7 +391,7 @@
 
 	tracker_dbus_reply_with_query_result (rec, res);
 
-	//tracker_db_free_result (res);
+	tracker_db_free_result (res);
 }