** Fix for bug #543943

2008-07-23  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #543943

	* camel/camel-store.c: (construct):
	* camel/camel-folder.c: (camel_folder_construct):
	* camel/camel-vee-folder.c: (summary_header_to_db):
	* camel/camel.c: (camel_init):
	* camel/camel-db.c: (cdb_sql_exec), (camel_db_count_message_info),
	(camel_db_select):
	* camel/camel-folder-summary.c: (camel_folder_summary_migrate_infos),
	(message_info_from_uid), (camel_folder_summary_save_to_db),
	(camel_folder_summary_header_load_from_db),
	(camel_folder_summary_remove_range), (summary_header_to_db):

	* camel/providers/imap/camel-imap-store.c: (camel_imap_store_finalize):
	* camel/providers/imap/camel-imap-summary.c: (message_info_from_db): Leak fix.

	* camel/providers/local/camel-local-summary.c: (summary_header_from_db):
	Reassign structure member correctly, otherwise can cause a crash.
	* camel/providers/local/camel-maildir-store.c: (scan_dirs): Leak fix.

svn path=/trunk/; revision=9171

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 102c2ea..d88f07c 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,19 @@
+2008-07-23  Milan Crha  <mcrha@redhat.com>
+
+       ** Fix for bug #543943
+
+       * camel-store.c: (construct):
+       * camel-folder.c: (camel_folder_construct):
+       * camel-vee-folder.c: (summary_header_to_db):
+       * camel.c: (camel_init):
+       * camel-db.c: (cdb_sql_exec), (camel_db_count_message_info),
+       (camel_db_select):
+       * camel-folder-summary.c: (camel_folder_summary_migrate_infos),
+       (message_info_from_uid), (camel_folder_summary_save_to_db),
+       (camel_folder_summary_header_load_from_db),
+       (camel_folder_summary_remove_range), (summary_header_to_db):
+       Leak fix.
+
 2008-07-22  Matthew Barnes  <mbarnes@redhat.com>
 
        ** Fix a bunch of Gtk-Doc warnings.

diff --git a/camel/camel-db.c b/camel/camel-db.c
index 8581c43..4273c69 100644 (file)
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -42,7 +42,7 @@ static GStaticRecMutex trans_lock = G_STATIC_REC_MUTEX_INIT;
 static int 
 cdb_sql_exec (sqlite3 *db, const char* stmt, CamelException *ex) 
 {
-       char *errmsg;
+       char *errmsg = NULL;
        int   ret = -1;
 
        d(g_print("Camel SQL Exec:\n%s\n", stmt));
@@ -50,16 +50,27 @@ cdb_sql_exec (sqlite3 *db, const char* stmt, CamelException *ex)
 
        ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
        while (ret == SQLITE_BUSY || ret == SQLITE_LOCKED || ret == -1) {
-                       ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
+               if (errmsg) {
+                       sqlite3_free (errmsg);
+                       errmsg = NULL;
+               }
+               ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
        }
 
        if (ret != SQLITE_OK) {
-                       d(g_print ("Error in SQL EXEC statement: %s [%s].\n", stmt, errmsg));
-                       if (ex) 
+               d(g_print ("Error in SQL EXEC statement: %s [%s].\n", stmt, errmsg));
+               if (ex) 
                        camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _(errmsg));
                sqlite3_free (errmsg);
+               errmsg = NULL;
                return -1;
        }
+
+       if (errmsg) {
+               sqlite3_free (errmsg);
+               errmsg = NULL;
+       }
+
        return 0;
 }
 
@@ -244,20 +255,32 @@ static int
 camel_db_count_message_info (CamelDB *cdb, const char *query, guint32 *count, CamelException *ex)
 {
        int ret = -1;
-       char *errmsg;
+       char *errmsg = NULL;
 
        ret = sqlite3_exec(cdb->db, query, count_cb, count, &errmsg);
        while (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) {
+               if (errmsg) {
+                       sqlite3_free (errmsg);
+                       errmsg = NULL;
+               }
+
                ret = sqlite3_exec (cdb->db, query, count_cb, count, &errmsg);
        }
 
        CAMEL_DB_RELEASE_SQLITE_MEMORY;
                
        if (ret != SQLITE_OK) {
-                       g_print ("Error in SQL SELECT statement: %s [%s]\n", query, errmsg);
-                       camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _(errmsg));
-                       sqlite3_free (errmsg);
+               g_print ("Error in SQL SELECT statement: %s [%s]\n", query, errmsg);
+               camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _(errmsg));
+               sqlite3_free (errmsg);
+               errmsg = NULL;
+       }
+
+       if (errmsg) {
+               sqlite3_free (errmsg);
+               errmsg = NULL;
        }
+
        return ret;
 }
 
@@ -385,7 +408,7 @@ camel_db_count_total_message_info (CamelDB *cdb, const char *table_name, guint32
 int
 camel_db_select (CamelDB *cdb, const char* stmt, CamelDBSelectCB callback, gpointer data, CamelException *ex) 
 {
-       char *errmsg;
+       char *errmsg = NULL;
        //int nrecs = 0;
        int ret = -1;
 
@@ -396,6 +419,11 @@ camel_db_select (CamelDB *cdb, const char* stmt, CamelDBSelectCB callback, gpoin
 
        ret = sqlite3_exec(cdb->db, stmt, callback, data, &errmsg);
        while (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) {
+               if (errmsg) {
+                       sqlite3_free (errmsg);
+                       errmsg = NULL;
+               }
+
                ret = sqlite3_exec (cdb->db, stmt, callback, data, &errmsg);
        }
 
@@ -405,8 +433,14 @@ camel_db_select (CamelDB *cdb, const char* stmt, CamelDBSelectCB callback, gpoin
                d(g_warning ("Error in select statement '%s' [%s].\n", stmt, errmsg));
                camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, errmsg);
                sqlite3_free (errmsg);
+               errmsg = NULL;
        }
 
+       if (errmsg) {
+               sqlite3_free (errmsg);
+               errmsg = NULL;
+       }
+
        return ret;
 }
 

diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 2292c4f..5321ec1 100644 (file)
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -510,11 +510,14 @@ message_info_from_uid (CamelFolderSummary *s, const char *uid)
                info = g_hash_table_lookup (s->loaded_infos, uid);
                
                if (!info) {
+                       char *errmsg = g_strdup_printf ("no uid [%s] exists", uid);
+
                        /* Makes no sense now as the exception is local as of now. FIXME: Pass exception from caller */
-                       camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM, _(g_strdup_printf ("no uid [%s] exists", uid)));
+                       camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM, _(errmsg));
                        // if (strcmp (folder_name, "UNMATCHED"))                       
                        g_warning ("No uid[%s] exists in %s\n", uid, folder_name);
                        camel_exception_clear (&ex);
+                       g_free (errmsg);
                }
        } else
                info->refcount++;
@@ -1107,6 +1110,8 @@ camel_folder_summary_migrate_infos(CamelFolderSummary *s)
        }
        
        ret = camel_db_write_folder_info_record (cdb, record, &ex);
+
+       g_free (record->bdata);
        g_free (record);
 
        if (ret != 0) {
@@ -1251,6 +1256,7 @@ camel_folder_summary_save_to_db (CamelFolderSummary *s, CamelException *ex)
        
        camel_db_begin_transaction (cdb, ex);
        ret = camel_db_write_folder_info_record (cdb, record, ex);
+       g_free (record->bdata);
        g_free (record);
 
        if (ret != 0) {
@@ -1428,8 +1434,7 @@ camel_folder_summary_header_load_from_db (CamelFolderSummary *s, CamelStore *sto
        }
 
        g_free (record->folder_name);
-       #warning "Crashes, take care"
-       //g_free (record->bdata); 
+       g_free (record->bdata);
        g_free (record);
 
        return ret;
@@ -2093,6 +2098,7 @@ camel_folder_summary_remove_range (CamelFolderSummary *s, int start, int end)
 
                CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 
+               camel_exception_clear (&ex);
        } else {
                CAMEL_SUMMARY_UNLOCK(s, summary_lock);
        }
@@ -2382,10 +2388,11 @@ summary_header_to_db (CamelFolderSummary *s, CamelException *ex)
 {
        CamelFIRecord * record = g_new0 (CamelFIRecord, 1);
        CamelDB *db;
+       char *table_name;
 
        db = s->folder->cdb;
-       //char *table_name = safe_table (camel_file_util_safe_filename (s->folder->full_name));
-       char *table_name = s->folder->full_name;
+       //table_name = safe_table (camel_file_util_safe_filename (s->folder->full_name));
+       table_name = s->folder->full_name;
 
        io(printf("Savining header to db\n"));
 

diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index c3a355a..27a4153 100644 (file)
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -265,8 +265,11 @@ camel_folder_construct (CamelFolder *folder, CamelStore *parent_store,
        store_db_path = g_build_filename (service->url->path, CAMEL_DB_FILE, NULL);
        camel_exception_init(&ex);
        if (strlen (store_db_path) < 2) {
+               char *store_path = camel_session_get_storage_path ((CamelSession *)camel_service_get_session (service), service, &ex);
+
                g_free (store_db_path);
-               store_db_path = g_build_filename ( camel_session_get_storage_path ((CamelSession *)camel_service_get_session (service), service, &ex), CAMEL_DB_FILE, NULL);            
+               store_db_path = g_build_filename (store_path, CAMEL_DB_FILE, NULL);
+               g_free (store_path);
        }
 
 

diff --git a/camel/camel-store.c b/camel/camel-store.c
index 39ae0a3..21c727f 100644 (file)
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -215,8 +215,11 @@ construct (CamelService *service, CamelSession *session,
        store_db_path = g_build_filename (service->url->path, CAMEL_DB_FILE, NULL);
 
        if (strlen (store_db_path) < 2) {
+               char *store_path = camel_session_get_storage_path (session, service, ex);
+
                g_free (store_db_path);
-               store_db_path = g_build_filename ( camel_session_get_storage_path (session, service, ex), CAMEL_DB_FILE, NULL);         
+               store_db_path = g_build_filename (store_path, CAMEL_DB_FILE, NULL);
+               g_free (store_path);
        }
 
        store->cdb = camel_db_open (store_db_path, ex);

diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 41fc341..2f00ce6 100644 (file)
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -471,10 +471,10 @@ summary_header_to_db (CamelFolderSummary *s, CamelException *ex)
 {
        CamelFIRecord * record = g_new0 (CamelFIRecord, 1);
        CamelDB *db;
+       char *table_name;
 
        db = s->folder->parent_store->cdb;
-       char *table_name = s->folder->full_name;
-
+       table_name = s->folder->full_name;
 
        record->folder_name = table_name;
 

diff --git a/camel/camel.c b/camel/camel.c
index 017283f..59c61c8 100644 (file)
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -105,6 +105,7 @@ camel_init (const char *configdir, gboolean nss_init)
                if (NSS_InitReadWrite (nss_configdir) == SECFailure) {
                        /* fall back on using volatile dbs? */
                        if (NSS_NoDB_Init (nss_configdir) == SECFailure) {
+                               g_free (nss_configdir);
                                g_warning ("Failed to initialize NSS");
                                return -1;
                        }
@@ -121,6 +122,8 @@ camel_init (const char *configdir, gboolean nss_init)
                SSL_OptionSetDefault (SSL_ENABLE_SSL3, PR_TRUE);
                SSL_OptionSetDefault (SSL_ENABLE_TLS, PR_TRUE);
                SSL_OptionSetDefault (SSL_V2_COMPATIBLE_HELLO, PR_TRUE /* maybe? */);
+
+               g_free (nss_configdir);
        }
 #endif /* HAVE_NSS */
        

diff --git a/camel/providers/imap/ChangeLog b/camel/providers/imap/ChangeLog
index da217b2..2911f39 100644 (file)
--- a/camel/providers/imap/ChangeLog
+++ b/camel/providers/imap/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-23  Milan Crha  <mcrha@redhat.com>
+
+       ** Part of fix for bug #543943
+
+       * camel-imap-store.c: (camel_imap_store_finalize):
+       * camel-imap-summary.c: (message_info_from_db): Leak fix.
+
 2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
 
        * camel-imap-summary.c: #include "camel-string-utils.h"

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 1c08884..c3a3c9d 100644 (file)
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -210,6 +210,9 @@ camel_imap_store_finalize (CamelObject *object)
                disco->diary = NULL;
        }
 
+       g_free (imap_store->namespace);
+       imap_store->namespace = NULL;
+
        g_free (imap_store->custom_headers);
 }
 

diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index c0e05d5..426e158 100644 (file)
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -272,9 +272,11 @@ message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
 
        info = camel_imap_summary_parent->message_info_from_db (s, mir);
        if (info) {
-               char *part = g_strdup (mir->bdata);
+               char *part = g_strdup (mir->bdata), *tmp;
+               tmp = part;
                iinfo = (CamelImapMessageInfo *)info;
                EXTRACT_FIRST_DIGIT (iinfo->server_flags)
+               g_free (tmp);
        }
 
        return info;

diff --git a/camel/providers/local/ChangeLog b/camel/providers/local/ChangeLog
index 9bb894f..6e0c1ef 100644 (file)
--- a/camel/providers/local/ChangeLog
+++ b/camel/providers/local/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-23  Milan Crha  <mcrha@redhat.com>
+
+       ** Part of fix for bug #543943
+
+       * camel-local-summary.c: (summary_header_from_db):
+       Reassign structure member correctly, otherwise can cause a crash.
+       * camel-maildir-store.c: (scan_dirs): Leak fix.
+
 2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
 
        * camel-local-summary.c: #include "camel-string-utils.h"

diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 715bbe5..652938d 100644 (file)
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -597,7 +597,7 @@ static int
 summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *fir)
 {
        CamelLocalSummary *cls = (CamelLocalSummary *)s;
-       char *part;
+       char *part, *tmp;
 
        /* We dont actually add our own headers, but version that we don't anyway */
 
@@ -608,7 +608,11 @@ summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *fir)
        if (part) {
                EXTRACT_FIRST_DIGIT (cls->version)
        }
-       fir->bdata = part;
+
+       /* keep only the rest of the bdata there (strip our version digit) */
+       tmp = g_strdup (part);
+       g_free (fir->bdata);
+       fir->bdata = tmp;
 
        return 0;
 }

diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index 07c5452..8c273fe 100644 (file)
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -488,6 +488,7 @@ scan_dirs(CamelStore *store, guint32 flags, CamelFolderInfo *topfi, CamelURL *ur
                        g_free(tmp);
                }
                closedir(dir);
+               g_free (name);
        }
 
        res = 0;