[evolution-data-server] Bug #621877 - Crash in summary_header_to_db at camel-vee-folder.c

[Milan Crha <mcrha src gnome org>]

commit d8b0fc5d4d8da14b024141327c380b6071a06376
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 17 16:35:25 2010 +0200

    Bug #621877 - Crash in summary_header_to_db at camel-vee-folder.c

 camel/camel-vee-folder.c |   81 ++++++++++++++++++++++++++++-----------------
 1 files changed, 50 insertions(+), 31 deletions(-)
---
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 7c3833c..5f6e4aa 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -935,46 +935,64 @@ vee_folder_stop_folder (CamelVeeFolder *vf, CamelFolder *sub)
 }
 
 static void
-vee_folder_finalize (GObject *object)
+vee_folder_dispose (GObject *object)
 {
-	CamelVeeFolder *vf;
-	CamelVeeFolder *folder_unmatched;
-	GList *node;
-	CamelFIRecord * record;
+	CamelFolder *folder;
 
-	vf = CAMEL_VEE_FOLDER (object);
-	vf->priv->destroyed = TRUE;
+	folder = CAMEL_FOLDER (object);
 
-	folder_unmatched = vf->parent_vee_store ? vf->parent_vee_store->folder_unmatched : NULL;
+	/* parent's class frees summary on dispose, thus depend on it */
+	if (folder->summary) {
+		CamelVeeFolder *vf;
+		CamelVeeFolder *folder_unmatched;
+		GList *node;
+		CamelFIRecord * record;
 
-	/* Save the counts to DB */
-	if (!vf->deleted) {
-		CamelFolder *folder;
-		CamelStore *parent_store;
-		CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+		vf = CAMEL_VEE_FOLDER (object);
+		vf->priv->destroyed = TRUE;
 
-		folder = CAMEL_FOLDER (vf);
-		parent_store = camel_folder_get_parent_store (folder);
-		record = summary_header_to_db (folder->summary, NULL);
-		camel_db_write_folder_info_record (parent_store->cdb_w, record, &ex);
-		g_free (record);
-		camel_exception_clear (&ex);
-	}
+		folder_unmatched = vf->parent_vee_store ? vf->parent_vee_store->folder_unmatched : NULL;
 
-	/* This may invoke sub-classes with partially destroyed state, they must deal with this */
-	if (vf == folder_unmatched) {
-		for (node = vf->priv->folders;node;node = g_list_next (node))
-			g_object_unref (node->data);
-	} else {
-		/* FIXME[disk-summary] See if it is really reqd */
-		camel_folder_freeze ((CamelFolder *)vf);
-		while (vf->priv->folders) {
-			CamelFolder *f = vf->priv->folders->data;
-			vee_folder_stop_folder (vf, f);
+		/* Save the counts to DB */
+		if (!vf->deleted) {
+			CamelFolder *folder;
+			CamelStore *parent_store;
+			CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+
+			folder = CAMEL_FOLDER (vf);
+			parent_store = camel_folder_get_parent_store (folder);
+			record = summary_header_to_db (folder->summary, NULL);
+			camel_db_write_folder_info_record (parent_store->cdb_w, record, &ex);
+			g_free (record);
+			camel_exception_clear (&ex);
+		}
+
+		/* This may invoke sub-classes with partially destroyed state, they must deal with this */
+		if (vf == folder_unmatched) {
+			for (node = vf->priv->folders;node;node = g_list_next (node))
+				g_object_unref (node->data);
+		} else {
+			/* FIXME[disk-summary] See if it is really reqd */
+			camel_folder_freeze ((CamelFolder *)vf);
+			while (vf->priv->folders) {
+				CamelFolder *f = vf->priv->folders->data;
+				vee_folder_stop_folder (vf, f);
+			}
+			camel_folder_thaw ((CamelFolder *)vf);
 		}
-		camel_folder_thaw ((CamelFolder *)vf);
 	}
 
+	/* Chain up to parent's dispose () method. */
+	G_OBJECT_CLASS (camel_vee_folder_parent_class)->dispose (object);
+}
+
+static void
+vee_folder_finalize (GObject *object)
+{
+	CamelVeeFolder *vf;
+
+	vf = CAMEL_VEE_FOLDER (object);
+
 	g_free (vf->expression);
 
 	g_list_free (vf->priv->folders);
@@ -1925,6 +1943,7 @@ camel_vee_folder_class_init (CamelVeeFolderClass *class)
 	g_type_class_add_private (class, sizeof (CamelVeeFolderPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = vee_folder_dispose;
 	object_class->finalize = vee_folder_finalize;
 
 	folder_class = CAMEL_FOLDER_CLASS (class);