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

Plug some leaks in SLAPI modifications handling

Browse Source
This commit is contained in:
Luke Howard 2005-08-06 14:58:25 +00:00
parent 682a1981a1
commit 6911e0022b
3 changed files with 17 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/slapd/slapi/proto-slapi.h
View File

@ -26,9 +26,8 @@
LDAP_BEGIN_DECL LDAP_BEGIN_DECL
/* slapi_utils.c */ /* slapi_utils.c */
LDAP_SLAPI_F (LDAPMod **) slapi_int_modifications2ldapmods LDAP_P(( Modifications **, void *ctx )); LDAP_SLAPI_F (LDAPMod **) slapi_int_modifications2ldapmods LDAP_P(( Modifications ** ));
LDAP_SLAPI_F (Modifications *) slapi_int_ldapmods2modifications LDAP_P(( LDAPMod **, void *ctx )); LDAP_SLAPI_F (Modifications *) slapi_int_ldapmods2modifications LDAP_P(( LDAPMod ** ));
LDAP_SLAPI_F (void) slapi_int_free_ldapmods LDAP_P(( LDAPMod ** ));
LDAP_SLAPI_F (int) slapi_int_count_controls LDAP_P(( LDAPControl **ctrls )); LDAP_SLAPI_F (int) slapi_int_count_controls LDAP_P(( LDAPControl **ctrls ));
LDAP_SLAPI_F (char **) slapi_get_supported_extended_ops LDAP_P((void)); LDAP_SLAPI_F (char **) slapi_get_supported_extended_ops LDAP_P((void));
LDAP_SLAPI_F (int) slapi_int_access_allowed LDAP_P((Operation *op, Entry *entry, AttributeDescription *desc, struct berval *val, slap_access_t access, AccessControlState *state )); LDAP_SLAPI_F (int) slapi_int_access_allowed LDAP_P((Operation *op, Entry *entry, AttributeDescription *desc, struct berval *val, slap_access_t access, AccessControlState *state ));

6
servers/slapd/slapi/slapi_pblock.c
View File

@ -607,7 +607,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
rc = PBLOCK_ERROR; rc = PBLOCK_ERROR;
break; break;
} }
mods = slapi_int_modifications2ldapmods( &pb->pb_op->orm_modlist, NULL ); mods = slapi_int_modifications2ldapmods( &pb->pb_op->orm_modlist );
pblock_set_default( pb, param, (void *)mods ); pblock_set_default( pb, param, (void *)mods );
} }
*((LDAPMod ***)value) = mods; *((LDAPMod ***)value) = mods;
@ -939,7 +939,7 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
break; break;
} }
newmods = slapi_int_ldapmods2modifications( (LDAPMod **)value, NULL ); newmods = slapi_int_ldapmods2modifications( (LDAPMod **)value );
if ( newmods != NULL ) { if ( newmods != NULL ) {
slap_mods_free( *mlp, 1 ); slap_mods_free( *mlp, 1 );
*mlp = newmods; *mlp = newmods;
@ -1289,7 +1289,7 @@ pblock_destroy( Slapi_PBlock *pb )
slapi_int_connection_done_pb( pb ); slapi_int_connection_done_pb( pb );
} else { } else {
pblock_get_default( pb, SLAPI_MODIFY_MODS, (void **)&mods ); pblock_get_default( pb, SLAPI_MODIFY_MODS, (void **)&mods );
slapi_int_free_ldapmods( mods ); ldap_mods_free( mods, 1 );
pblock_get_default( pb, SLAPI_SEARCH_ATTRS, (void **)&attrs ); pblock_get_default( pb, SLAPI_SEARCH_ATTRS, (void **)&attrs );
if ( attrs != NULL ) if ( attrs != NULL )

60
servers/slapd/slapi/slapi_utils.c
View File

@ -2681,7 +2681,7 @@ int slapi_acl_check_mods(Slapi_PBlock *pb, Slapi_Entry *e, LDAPMod **mods, char
if ( pb == NULL || pb->pb_op == NULL ) if ( pb == NULL || pb->pb_op == NULL )
return LDAP_PARAM_ERROR; return LDAP_PARAM_ERROR;
ml = slapi_int_ldapmods2modifications( mods, NULL ); ml = slapi_int_ldapmods2modifications( mods );
if ( ml == NULL ) { if ( ml == NULL ) {
return LDAP_OTHER; return LDAP_OTHER;
} }
@ -2703,10 +2703,7 @@ int slapi_acl_check_mods(Slapi_PBlock *pb, Slapi_Entry *e, LDAPMod **mods, char
* *
* This function must also be called before slap_mods_check(). * This function must also be called before slap_mods_check().
*/ */
LDAPMod **slapi_int_modifications2ldapmods( LDAPMod **slapi_int_modifications2ldapmods( Modifications **pmodlist )
Modifications **pmodlist,
void *memctx
)
{ {
Modifications *ml, *modlist; Modifications *ml, *modlist;
LDAPMod **mods, *modp; LDAPMod **mods, *modp;
@ -2717,10 +2714,10 @@ LDAPMod **slapi_int_modifications2ldapmods(
for( i = 0, ml = modlist; ml != NULL; i++, ml = ml->sml_next ) for( i = 0, ml = modlist; ml != NULL; i++, ml = ml->sml_next )
; ;
mods = (LDAPMod **)slap_sl_malloc( (i + 1) * sizeof(LDAPMod *), memctx ); mods = (LDAPMod **)slapi_ch_malloc( (i + 1) * sizeof(LDAPMod *) );
for( i = 0, ml = modlist; ml != NULL; ml = ml->sml_next ) { for( i = 0, ml = modlist; ml != NULL; ml = ml->sml_next ) {
mods[i] = (LDAPMod *)slap_sl_malloc( sizeof(LDAPMod), memctx ); mods[i] = (LDAPMod *)slapi_ch_malloc( sizeof(LDAPMod) );
modp = mods[i]; modp = mods[i];
modp->mod_op = ml->sml_op | LDAP_MOD_BVALUES; modp->mod_op = ml->sml_op | LDAP_MOD_BVALUES;
modp->mod_type = slapi_ch_strdup( ml->sml_type.bv_val ); modp->mod_type = slapi_ch_strdup( ml->sml_type.bv_val );
@ -2729,12 +2726,12 @@ LDAPMod **slapi_int_modifications2ldapmods(
if ( ml->sml_values != NULL ) { if ( ml->sml_values != NULL ) {
for( j = 0; ml->sml_values[j].bv_val != NULL; j++ ) for( j = 0; ml->sml_values[j].bv_val != NULL; j++ )
; ;
modp->mod_bvalues = (struct berval **)slap_sl_malloc( (j + 1) * modp->mod_bvalues = (struct berval **)slapi_ch_malloc( (j + 1) *
sizeof(struct berval *), memctx ); sizeof(struct berval *) );
for( j = 0; ml->sml_values[j].bv_val != NULL; j++ ) { for( j = 0; ml->sml_values[j].bv_val != NULL; j++ ) {
modp->mod_bvalues[j] = (struct berval *)slapi_ch_malloc(
sizeof(struct berval) );
/* Take ownership of original values. */ /* Take ownership of original values. */
modp->mod_bvalues[j] = (struct berval *)slap_sl_malloc(
sizeof(struct berval), memctx );
modp->mod_bvalues[j]->bv_len = ml->sml_values[j].bv_len; modp->mod_bvalues[j]->bv_len = ml->sml_values[j].bv_len;
modp->mod_bvalues[j]->bv_val = ml->sml_values[j].bv_val; modp->mod_bvalues[j]->bv_val = ml->sml_values[j].bv_val;
ml->sml_values[j].bv_len = 0; ml->sml_values[j].bv_len = 0;
@ -2763,7 +2760,7 @@ LDAPMod **slapi_int_modifications2ldapmods(
* before prettying (and we can't easily get out of calling * before prettying (and we can't easily get out of calling
* slap_mods_check() because we need normalized values). * slap_mods_check() because we need normalized values).
*/ */
Modifications *slapi_int_ldapmods2modifications ( LDAPMod **mods, void *memctx ) Modifications *slapi_int_ldapmods2modifications ( LDAPMod **mods )
{ {
Modifications *modlist = NULL, **modtail; Modifications *modlist = NULL, **modtail;
LDAPMod **modp; LDAPMod **modp;
@ -2787,7 +2784,7 @@ Modifications *slapi_int_ldapmods2modifications ( LDAPMod **mods, void *memctx )
continue; continue;
} }
mod = (Modifications *) slap_sl_malloc( sizeof(Modifications), memctx ); mod = (Modifications *) slapi_ch_malloc( sizeof(Modifications) );
mod->sml_op = lmod->mod_op & ~(LDAP_MOD_BVALUES); mod->sml_op = lmod->mod_op & ~(LDAP_MOD_BVALUES);
mod->sml_flags = 0; mod->sml_flags = 0;
mod->sml_type = ad->ad_cname; mod->sml_type = ad->ad_cname;
@ -2810,7 +2807,7 @@ Modifications *slapi_int_ldapmods2modifications ( LDAPMod **mods, void *memctx )
if ( i == 0 ) { if ( i == 0 ) {
mod->sml_values = NULL; mod->sml_values = NULL;
} else { } else {
mod->sml_values = (BerVarray) slap_sl_malloc( (i + 1) * sizeof(struct berval), memctx ); mod->sml_values = (BerVarray) slapi_ch_malloc( (i + 1) * sizeof(struct berval) );
/* NB: This implicitly trusts a plugin to return valid modifications. */ /* NB: This implicitly trusts a plugin to return valid modifications. */
if ( lmod->mod_op & LDAP_MOD_BVALUES ) { if ( lmod->mod_op & LDAP_MOD_BVALUES ) {
@ -2832,7 +2829,7 @@ Modifications *slapi_int_ldapmods2modifications ( LDAPMod **mods, void *memctx )
modtail = &mod->sml_next; modtail = &mod->sml_next;
} }
if ( slap_mods_check( modlist, &text, textbuf, sizeof( textbuf ), memctx ) != LDAP_SUCCESS ) { if ( slap_mods_check( modlist, &text, textbuf, sizeof( textbuf ), NULL ) != LDAP_SUCCESS ) {
slap_mods_free( modlist, 1 ); slap_mods_free( modlist, 1 );
modlist = NULL; modlist = NULL;
} }
@ -2840,39 +2837,6 @@ Modifications *slapi_int_ldapmods2modifications ( LDAPMod **mods, void *memctx )
return modlist; return modlist;
} }
/*
* This function only frees the parts of the mods array that
* are not shared with the Modification list that was created
* by slapi_int_ldapmods2modifications() (if dup == 0).
*/
void
slapi_int_free_ldapmods ( LDAPMod **mods )
{
int i, j;
if ( mods == NULL )
return;
for ( i = 0; mods[i] != NULL; i++ ) {
/*
* Don't free values themselves; they're owned by the
* Modification list. Do free the containing array.
*/
if ( mods[i]->mod_op & LDAP_MOD_BVALUES ) {
if ( mods[i]->mod_bvalues != NULL ) {
for ( j = 0; mods[i]->mod_bvalues[j] != NULL; j++ )
slapi_ch_free( (void **)&mods[i]->mod_bvalues[j] );
slapi_ch_free( (void **)&mods[i]->mod_bvalues );
}
} else {
slapi_ch_free( (void **)&mods[i]->mod_values );
}
slapi_ch_free_string( &mods[i]->mod_type );
slapi_ch_free( (void **)&mods[i] );
}
slapi_ch_free( (void **)&mods );
}
/* /*
* Sun ONE DS 5.x computed attribute support. Computed attributes * Sun ONE DS 5.x computed attribute support. Computed attributes
* allow for dynamically generated operational attributes, a very * allow for dynamically generated operational attributes, a very