if referential integrity is broken, things could go wrong; don't assert

[openldap] / servers / slapd / overlays / memberof.c

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 9bc2497cd61dfb645c88a6e2cca8f1a8536e062d..45c388650d4f8ac67dae28b47df751bd651709f6 100644 (file)
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -264,6 +264,7 @@ memberof_saveMember_cb( Operation *op, SlapReply *rs )
        if ( rs->sr_type == REP_SEARCH ) {
                memberof_cookie_t       *mc;
                Attribute               *a;
+               BerVarray               vals = NULL;
 
                mc = (memberof_cookie_t *)op->o_callback->sc_private;
                mc->foundit = 1;
@@ -272,12 +273,13 @@ memberof_saveMember_cb( Operation *op, SlapReply *rs )
                assert( rs->sr_entry->e_attrs != NULL );
 
                a = attr_find( rs->sr_entry->e_attrs, mc->ad );
+               if ( a != NULL ) {
+                       vals = a->a_nvals;
+               }
 
-               assert( a != NULL );
-
-               memberof_saved_member_set( op, mc->key, a->a_nvals );
+               memberof_saved_member_set( op, mc->key, vals );
 
-               if ( attr_find( a->a_next, mc->ad ) != NULL ) {
+               if ( a && attr_find( a->a_next, mc->ad ) != NULL ) {
                        Debug( LDAP_DEBUG_ANY,
                                "%s: memberof_saveMember_cb(\"%s\"): "
                                "more than one occurrence of \"%s\" "
@@ -484,7 +486,7 @@ memberof_value_modify(
                        char buf[ SLAP_TEXT_BUFLEN ];
                        snprintf( buf, sizeof( buf ),
                                "memberof_value_modify %s=\"%s\" failed err=%d",
-                               ad->ad_cname.bv_val, new_dn->bv_val, rs2.sr_err );
+                               ad->ad_cname.bv_val, old_dn->bv_val, rs2.sr_err );
                        Debug( LDAP_DEBUG_ANY, "%s: %s\n", op->o_log_prefix, buf, 0 );
                }