[Pkg-telepathy-commits] [empathy] 14/39: Don't dereference a NULL error

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository empathy.

commit a243fdeec4e1f6cb2aff0e7a821fd167f21932bf
Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
Date:   Wed Aug 7 19:29:15 2013 +0200

    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 837b2d5..09ab4dd 100644
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -664,7 +664,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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git