[evolution-data-server] Bug #680467 - Crash under camel_folder_search_search()

[Milan Crha <mcrha src gnome org>]

commit 934a3cf7aa52144b0200ac7baf09ac1617548ea2
Author: Milan Crha <mcrha redhat com>
Date:   Tue Aug 21 12:13:34 2012 +0200

    Bug #680467 - Crash under camel_folder_search_search()

 camel/camel-folder-search.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index bd2442b..0c78be1 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -388,14 +388,14 @@ camel_folder_search_count (CamelFolderSearch *search,
 
 	g_return_val_if_fail (search != NULL, 0);
 
+	p = search->priv;
+
 	if (g_cancellable_set_error_if_cancelled (cancellable, error))
 		goto fail;
 
 	if (!expr || !*expr)
 		expr = "(match-all)";
 
-	p = search->priv;
-
 	g_assert (search->folder);
 
 	p->cancellable = cancellable;
@@ -543,14 +543,14 @@ camel_folder_search_search (CamelFolderSearch *search,
 
 	g_return_val_if_fail (search != NULL, NULL);
 
+	p = search->priv;
+
 	if (g_cancellable_set_error_if_cancelled (cancellable, error))
 		goto fail;
 
 	if (!expr || !*expr)
 		expr = "(match-all)";
 
-	p = search->priv;
-
 	g_assert (search->folder);
 
 	p->cancellable = cancellable;