[evolution/evolution-3-12] Bug 734530 - Use-after-free in Automatic Contacts on error

[Milan Crha <mcrha src gnome org>]

commit 997d967f43aa4f74f5a90e46185eabc05ab02ba9
Author: Milan Crha <mcrha redhat com>
Date:   Mon Dec 1 11:43:17 2014 +0100

    Bug 734530 - Use-after-free in Automatic Contacts on error

 plugins/bbdb/bbdb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index babe98d..4d95ecf 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -337,8 +337,8 @@ bbdb_do_it (EBookClient *client,
                                NULL, &error);
 
                if (error != NULL) {
-                       g_warning ("bbdb: Failed to get addressbook client : %s\n", error->message);
-                       g_error_free (error);
+                       g_warning ("bbdb: Failed to get addressbook client: %s\n", error->message);
+                       g_clear_error (&error);
                        aux_addressbooks = aux_addressbooks->next;
                        continue;
                }