evolution-data-server r9130 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Fri Jul 18 09:14:01 2008
New Revision: 9130
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9130&view=rev

Log:
Fix trash/junk crash.


Modified:
   trunk/camel/camel-db.c

Modified: trunk/camel/camel-db.c
==============================================================================
--- trunk/camel/camel-db.c	(original)
+++ trunk/camel/camel-db.c	Fri Jul 18 09:14:01 2008
@@ -501,9 +501,10 @@
 	 sel_query = sqlite3_mprintf("SELECT uid FROM %Q where junk=1", folder_name);
 
 	 ret = camel_db_select (db, sel_query, read_uids_callback, array, ex);
+
 	 sqlite3_free (sel_query);
 
-	 if (!array->len) {
+	 if (!array->len || ret != 0) {
 		 g_ptr_array_free (array, TRUE);
 		 array = NULL;
 	 } 
@@ -522,7 +523,7 @@
 	 ret = camel_db_select (db, sel_query, read_uids_callback, array, ex);
 	 sqlite3_free (sel_query);
 
-	 if (!array->len) {
+	 if (!array->len || ret != 0) {
 		 g_ptr_array_free (array, TRUE);
 		 array = NULL;
 	 }