mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tmpmemctx conflicts

Browse Source
This commit is contained in:
Howard Chu 2003-08-19 03:19:07 +00:00
parent 9b0de44b91
commit f1b8808010
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/slapd/attr.c
View File

@ -167,7 +167,7 @@ attr_merge_normalize(
for ( i = 0; vals[i].bv_val; i++ ); for ( i = 0; vals[i].bv_val; i++ );
nvals = ch_calloc( sizeof(struct berval), i + 1 ); nvals = sl_calloc( sizeof(struct berval), i + 1, memctx );
for ( i = 0; vals[i].bv_val; i++ ) { for ( i = 0; vals[i].bv_val; i++ ) {
rc = (*desc->ad_type->sat_equality->smr_normalize)( rc = (*desc->ad_type->sat_equality->smr_normalize)(
0, 0,
@ -187,7 +187,7 @@ attr_merge_normalize(
error_return:; error_return:;
if ( nvals != NULL ) { if ( nvals != NULL ) {
ber_bvarray_free( nvals ); ber_bvarray_free_x( nvals, memctx );
} }
return rc; return rc;
} }
@ -252,7 +252,7 @@ attr_merge_normalize_one(
rc = attr_merge_one( e, desc, val, nvalp ); rc = attr_merge_one( e, desc, val, nvalp );
if ( nvalp != NULL ) { if ( nvalp != NULL ) {
ch_free( nval.bv_val ); sl_free( nval.bv_val, memctx );
} }
return rc; return rc;
} }