Don't dereference a NULL error

libsecret returns FALSE without an error in some cases but we
unconditionally dereference it, causing a crash.

https://bugzilla.gnome.org/show_bug.cgi?id=692105

diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c
index 40667342faaa8c1708fbe4751a73e857f71a13df..367346b0a6f0f0d10f4b1300877107e7b7efff06 100644 (file)
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -656,7 +656,8 @@ items_delete_cb (GObject *source,
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
   GError *error = NULL;
 
-  if (!secret_password_clear_finish (result, &error))
+  secret_password_clear_finish (result, &error);
+  if (error != NULL)
     {
       g_simple_async_result_set_error (simple, TP_ERROR,
               TP_ERROR_DOES_NOT_EXIST, "%s", error->message);