struct berval fixes, fix memory leak in ldap_send_entry

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 378a3c621dc5b8e4fedb9a866fb9ddb319c1a990..577c4330705996c31240e985217ba4abb6c41337 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -380,7 +380,7 @@ ldap_send_entry(
        struct berval *bv, bdn;
        const char *text;
 
-       if ( ber_scanf( &ber, "{o", &bdn ) == LBER_ERROR ) {
+       if ( ber_scanf( &ber, "{o{", &bdn ) == LBER_ERROR ) {
                return;
        }
 #ifdef ENABLE_REWRITE
@@ -423,7 +423,7 @@ ldap_send_entry(
        ent.e_private = 0;
        attrp = &ent.e_attrs;
 
-       while ( ber_scanf( &ber, "{{o", &a ) != LBER_ERROR ) {
+       while ( ber_scanf( &ber, "{o", &a ) != LBER_ERROR ) {
                ldap_back_map(&li->at_map, &a, &mapped, 1);
                if (mapped.bv_val == NULL)
                        continue;
@@ -449,19 +449,20 @@ ldap_send_entry(
                                continue;
                        }
                }
+               free( a.bv_val );
                if (ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR ) {
                        attr->a_vals = &dummy;
                } else if ( strcasecmp( mapped.bv_val, "objectclass" ) == 0 ) {
                        int i, last;
                        for ( last = 0; attr->a_vals[last].bv_val; last++ ) ;
-                       for ( i = 0; ( bv = &attr->a_vals[i] ); i++ ) {
+                       for ( i = 0, bv = attr->a_vals; bv->bv_val; bv++, i++ ) {
                                ldap_back_map(&li->oc_map, bv, &mapped, 1);
                                if (mapped.bv_val == NULL) {
-                                       free(attr->a_vals[i].bv_val);
-                                       attr->a_vals[i].bv_val = NULL;
+                                       free(bv->bv_val);
+                                       bv->bv_val = NULL;
                                        if (--last < 0)
                                                break;
-                                       attr->a_vals[i] = attr->a_vals[last];
+                                       *bv = attr->a_vals[last];
                                        attr->a_vals[last].bv_val = NULL;
                                        i--;
                                } else if ( mapped.bv_val != bv->bv_val ) {

diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index 562b547bae892cc315780f97889b845613c9bc3b..22ddb93126443ff6be146b48ca46cd93eb6c47ee 100644 (file)
--- a/servers/slapd/back-ldap/suffixmassage.c
+++ b/servers/slapd/back-ldap/suffixmassage.c
@@ -60,7 +60,7 @@ ldap_back_dn_massage(
                res->bv_len = 0;
                return;
        }
-        if ( li == NULL ) {
+        if ( li == NULL || li->suffix_massage == NULL ) {
                *res = *dn;
                return;
        }
@@ -74,7 +74,7 @@ ldap_back_dn_massage(
        }
 
         for ( i = 0;
-                li->suffix_massage != NULL && li->suffix_massage[i] != NULL;
+                li->suffix_massage[i] != NULL;
                 i += 4 ) {
                 int aliasLength = li->suffix_massage[i+src]->bv_len;
                 int diff = dn->bv_len - aliasLength;