Berkeley DB 4.2 support (DB 4.2 required by default)

[openldap] / servers / slapd / filterentry.c

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 49927c407a717c80c39dd614978493727369a645..0086b34ab0ebcbd029e6592525d09d2729f036a3 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -196,6 +196,7 @@ static int test_mra_filter(
        MatchingRuleAssertion *mra )
 {
        Attribute       *a;
+       void *memctx = op ? op->o_tmpmemctx : NULL;
 
        if ( mra->ma_desc ) {
                /*
@@ -217,12 +218,13 @@ static int test_mra_filter(
                        /* If ma_rule is not the same as the attribute's
                         * normal rule, then we can't use the a_nvals.
                         */
-                       if (mra->ma_rule == a->a_desc->ad_type->sat_equality)
+                       if (mra->ma_rule == a->a_desc->ad_type->sat_equality) {
                                bv = a->a_nvals;
-                       else
+                       } else {
                                bv = a->a_vals;
-                       for ( ; bv->bv_val != NULL; bv++ )
-                       {
+                       }
+
+                       for ( ; bv->bv_val != NULL; bv++ ) {
                                int ret;
                                int rc;
                                const char *text;
@@ -257,7 +259,7 @@ static int test_mra_filter(
                        /* normalize for equality */
                        rc = asserted_value_validate_normalize( a->a_desc, mra->ma_rule,
                                SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
-                               &mra->ma_value, &value, &text, op->o_tmpmemctx );
+                               &mra->ma_value, &value, &text, memctx );
                        if ( rc != LDAP_SUCCESS ) {
                                continue;
                        }
@@ -299,7 +301,7 @@ static int test_mra_filter(
                int             rc;
 
                /* parse and pretty the dn */
-               rc = dnPrettyDN( NULL, &e->e_name, &dn, op->o_tmpmemctx );
+               rc = dnPrettyDN( NULL, &e->e_name, &dn, memctx );
                if ( rc != LDAP_SUCCESS ) {
                        return LDAP_INVALID_SYNTAX;
                }
@@ -337,7 +339,7 @@ static int test_mra_filter(
                                        rc = asserted_value_validate_normalize( ad,
                                                mra->ma_rule,
                                                SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
-                                               &mra->ma_value, &value, &text, op->o_tmpmemctx );
+                                               &mra->ma_value, &value, &text, memctx );
                                        if ( rc != LDAP_SUCCESS ) {
                                                continue;
                                        }
@@ -354,12 +356,12 @@ static int test_mra_filter(
                                        bv, &value, &text );
 
                                if( rc != LDAP_SUCCESS ) {
-                                       ldap_dnfree_x( dn, op->o_tmpmemctx );
+                                       ldap_dnfree_x( dn, memctx );
                                        return rc;
                                }
 
                                if ( ret == 0 ) {
-                                       ldap_dnfree_x( dn, op->o_tmpmemctx );
+                                       ldap_dnfree_x( dn, memctx );
                                        return LDAP_COMPARE_TRUE;
                                }
                        }
@@ -453,7 +455,7 @@ test_ava_filter(
        }
 
        if ( ava->aa_desc == slap_schema.si_ad_hasSubordinates 
-                       && op->o_bd && op->o_bd->be_has_subordinates ) {
+                       && op && op->o_bd && op->o_bd->be_has_subordinates ) {
                int             hasSubordinates;
                struct berval   hs;
 
@@ -511,7 +513,7 @@ test_presence_filter(
                 * is boolean-valued; I think we may live with this 
                 * simplification by now
                 */
-               if ( op->o_bd && op->o_bd->be_has_subordinates ) {
+               if ( op && op->o_bd && op->o_bd->be_has_subordinates ) {
                        return LDAP_COMPARE_TRUE;
                }