mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-07-24 17:10:29 +00:00
parent cd7540feee
commit 075a450b49
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/attr.c
View File

@ -78,17 +78,17 @@ Attribute *attr_dup( Attribute *a )
tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
ber_dupbv( &tmp->a_vals[i], &a->a_vals[i] );
if( tmp->a_vals[i].bv_val == NULL ) break;
if( BER_BVISNULL( &tmp->a_vals[i] ) ) break;
}
tmp->a_vals[i].bv_val = NULL;
BER_BVZERO( &tmp->a_vals[i] );
if( a->a_nvals != a->a_vals ) {
tmp->a_nvals = ch_malloc((i+1) * sizeof(struct berval));
for( i=0; a->a_nvals[i].bv_val != NULL; i++ ) {
ber_dupbv( &tmp->a_nvals[i], &a->a_nvals[i] );
if( tmp->a_nvals[i].bv_val == NULL ) break;
if( BER_BVISNULL( &tmp->a_nvals[i] ) ) break;
}
tmp->a_nvals[i].bv_val = NULL;
BER_BVZERO( &tmp->a_nvals[i] );
} else {
tmp->a_nvals = tmp->a_vals;
@ -197,11 +197,11 @@ attr_merge_normalize(
&vals[i], &nvals[i], memctx );
if ( rc != LDAP_SUCCESS ) {
nvals[i+1].bv_val = NULL;
BER_BVZERO( &nvals[i+1] );
goto error_return;
}
}
nvals[i].bv_val = NULL;
BER_BVZERO( &nvals[i] );
}
rc = attr_merge( e, desc, vals, nvals );