[evolution/webkit] Bug #651135 - Crash using saved search with an empty expression

[Dan VrÃtil <dvratil src gnome org>]

commit 368fc924787b862b12883015a581ec3c763396e4
Author: Milan Crha <mcrha redhat com>
Date:   Thu May 26 13:47:45 2011 +0200

    Bug #651135 - Crash using saved search with an empty expression

 addressbook/gui/widgets/e-addressbook-model.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 3be37f2..73d6776 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -905,6 +905,9 @@ e_addressbook_model_get_query (EAddressbookModel *model)
 {
 	g_return_val_if_fail (E_IS_ADDRESSBOOK_MODEL (model), NULL);
 
+	if (!model->priv->query)
+		return NULL;
+
 	return e_book_query_to_string (model->priv->query);
 }
 
@@ -921,6 +924,9 @@ e_addressbook_model_set_query (EAddressbookModel *model,
 	else
 		book_query = e_book_query_from_string (query);
 
+	if (!book_query)
+		return;
+
 	if (model->priv->query != NULL) {
 		gchar *old_query, *new_query;