From: Milan Crha <mcrha@redhat.com>
Date: Fri, 19 Nov 2010 08:51:15 +0000 (+0100)
Subject: Bug #633181 - Deadlock after moving some mails in maildir
X-Git-Tag: upstream/3.7.4~2423
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efe203ae1e83633aa49d72eae49b7505997d2fad;p=platform%2Fupstream%2Fevolution-data-server.git

Bug #633181 - Deadlock after moving some mails in maildir
---

diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index e985125..dff4521 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1269,8 +1269,10 @@ message_info_from_uid (CamelFolderSummary *s, const gchar *uid)
 		ret = camel_db_read_message_info_record_with_uid (
 			cdb, folder_name, uid, &data,
 			camel_read_mir_callback, NULL);
-		if (ret != 0)
+		if (ret != 0) {
+			camel_folder_summary_unlock (s, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 			return NULL;
+		}
 
 		/* We would have double reffed at camel_read_mir_callback */
 		info = g_hash_table_lookup (s->loaded_infos, uid);