From be542f50da6bc3e7d24b808aac16b1f542be7dc0 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Wed, 7 Aug 2013 19:29:15 +0200 Subject: 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 --- libempathy/empathy-keyring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c index 40667342f..367346b0a 100644 --- 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); -- cgit v1.2.3