[evolution/webkit] Bug #652627 - Invalid unref on a NULL pointer from query_cb

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

commit 90e0bbf1440d75a5c3d6693de165d20b7f5f31d2
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 29 12:02:14 2011 +0200

    Bug #652627 - Invalid unref on a NULL pointer from query_cb

 addressbook/gui/merging/eab-contact-compare.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 1ba9b38..8295b77 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -642,7 +642,8 @@ query_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
 	info->cb (info->contact, best_contact, best_match, info->closure);
 	match_search_info_free (info);
 	g_object_unref (book_client);
-	g_object_unref (best_contact);
+	if (best_contact)
+		g_object_unref (best_contact);
 }
 
 #define MAX_QUERY_PARTS 10