[evolution-data-server/gnome-3-26] Prevent passing NULL ldap handle into LDAP functions ][

[Milan Crha <mcrha src gnome org>]

commit 332da1091b67e613b179d7274fea7f371c9aa38d
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 24 10:31:06 2018 +0100

    Prevent passing NULL ldap handle into LDAP functions ][
    
    Follow up change for a downstream report:
    https://bugzilla.redhat.com/show_bug.cgi?id=1530569

 .../backends/ldap/e-book-backend-ldap.c            |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/addressbook/backends/ldap/e-book-backend-ldap.c 
b/src/addressbook/backends/ldap/e-book-backend-ldap.c
index 01e3375..74887bd 100644
--- a/src/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/src/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -3989,8 +3989,8 @@ build_contact_from_entry (EBookBackendLDAP *bl,
        ldap_memfree (dn);
        if (ldap_uid) *ldap_uid = NULL;
 
-       for (attr = ldap_first_attribute (bl->priv->ldap, e, &ber); attr;
-            attr = ldap_next_attribute (bl->priv->ldap, e, ber)) {
+       for (attr = ldap_first_attribute (bl->priv->ldap, e, &ber); attr && bl->priv->ldap;
+            attr = bl->priv->ldap ? ldap_next_attribute (bl->priv->ldap, e, ber) : NULL) {
                gint i;
                struct prop_info *info = NULL;
                gchar **values;
@@ -4032,7 +4032,6 @@ build_contact_from_entry (EBookBackendLDAP *bl,
 
                        if (info) {
                                if (info->prop_type & PROP_WRITE_ONLY) {
-                                       g_rec_mutex_lock (&eds_ldap_handler_lock);
                                        continue;
                                }