Do not return pointers into BerElement we do not own

[openldap] / servers / slapd / back-meta / compare.c

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 3f18f88c1798c24c37bbe831c8fdfa82207ed298..b4131c7557c667916df4003b218e67d0362cd18e 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -96,6 +96,8 @@ meta_back_compare(
        lc = meta_back_getconn( li, conn, op, META_OP_ALLOW_MULTIPLE,
                        ndn, NULL );
        if ( !lc || !meta_back_dobind( lc, op ) ) {
+               send_ldap_result( conn, op, LDAP_OTHER,
+                               NULL, NULL, NULL, NULL );
                return -1;
        }
 
@@ -113,6 +115,7 @@ meta_back_compare(
                struct berval mapped_value = ava->aa_value;
 
                if ( lsc->candidate != META_CANDIDATE ) {
+                       msgid[ i ] = -1;
                        continue;
                }
 
@@ -152,13 +155,12 @@ meta_back_compare(
                /*
                 * if attr is objectClass, try to remap the value
                 */
-               if ( ava->aa_desc->ad_type->sat_oid 
-                       == slap_schema.si_ad_objectClass->ad_type->sat_oid ) {
+               if ( ava->aa_desc == slap_schema.si_ad_objectClass ) {
                        ldap_back_map( &li->targets[ i ]->oc_map,
-                                       &ava->aa_value, &mapped_value, 0 );
+                                       &ava->aa_value, &mapped_value,
+                                       BACKLDAP_MAP );
 
-                       if ( mapped_value.bv_val == NULL ) {
-                               lsc->candidate = META_NOT_CANDIDATE;
+                       if ( mapped_value.bv_val == NULL || mapped_value.bv_val[0] == '\0' ) {
                                continue;
                        }
                /*
@@ -166,9 +168,9 @@ meta_back_compare(
                 */
                } else {
                        ldap_back_map( &li->targets[ i ]->at_map,
-                               &ava->aa_desc->ad_cname, &mapped_attr, 0 );
-                       if ( mapped_attr.bv_val == NULL ) {
-                               lsc->candidate = META_NOT_CANDIDATE;
+                               &ava->aa_desc->ad_cname, &mapped_attr,
+                               BACKLDAP_MAP );
+                       if ( mapped_attr.bv_val == NULL || mapped_attr.bv_val[0] == '\0' ) {
                                continue;
                        }
                }
@@ -180,11 +182,6 @@ meta_back_compare(
                 */
                msgid[ i ] = ldap_compare( lc->conns[ i ].ld, mdn,
                                mapped_attr.bv_val, mapped_value.bv_val );
-               if ( msgid[ i ] == -1 ) {
-                       lsc->candidate = META_NOT_CANDIDATE;
-                       continue;
-               }
-
                if ( mdn != dn->bv_val ) {
                        free( mdn );
                }
@@ -195,6 +192,10 @@ meta_back_compare(
                        free( mapped_value.bv_val );
                }
 
+               if ( msgid[ i ] == -1 ) {
+                       continue;
+               }
+
                ++candidates;
        }
 
@@ -210,7 +211,7 @@ meta_back_compare(
                        int lrc;
                        LDAPMessage *res = NULL;
 
-                       if ( lsc->candidate != META_CANDIDATE ) {
+                       if ( msgid[ i ] == -1 ) {
                                continue;
                        }
 
@@ -267,10 +268,11 @@ meta_back_compare(
                                        last = i;
                                        break;
                                }
-                               lsc->candidate = META_NOT_CANDIDATE;
+                               msgid[ i ] = -1;
                                --candidates;
+
                        } else {
-                               lsc->candidate = META_NOT_CANDIDATE;
+                               msgid[ i ] = -1;
                                --candidates;
                                if ( res ) {
                                        ldap_msgfree( res );