upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 09:09:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9892 Free operation data at the end of a transaction

Browse source
This commit is contained in:
Ondřej Kuzník 2022-09-15 09:14:10 +01:00
parent 3ad71958ee
commit aa209e4647
2 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/add.c
View file

@ -198,7 +198,6 @@ do_add( Operation *op, SlapReply *rs )
return rc;
}
LDAP_SLIST_REMOVE(&op->o_extra, &oex->oe, OpExtra, oe_next);
if ( rc == LDAP_TXN_SPECIFY_OKAY ) {
/* skip cleanup */
return rc;
@ -214,6 +213,7 @@ do_add( Operation *op, SlapReply *rs )
op->o_bd = bd;
}
}
LDAP_SLIST_REMOVE(&op->o_extra, &oex->oe, OpExtra, oe_next);
op->o_tmpfree( oex, op->o_tmpmemctx );
done:;

46
servers/slapd/txn.c
View file

@ -260,6 +260,7 @@ int txn_end_extop(
rc = (&o->o_bd->bd_info->bi_op_bind)[opidx]( o, &rs );
ldap_pvt_thread_mutex_lock( &c->c_mutex );
}
LDAP_SLIST_REMOVE( &o->o_extra, txn, OpExtra, oe_next );
if ( rc ) {
struct berval *bv = NULL;
BerElementBuffer berbuf;
@ -304,8 +305,53 @@ int txn_end_extop(
drain:
/* drain txn ops list */
while (( o = LDAP_STAILQ_FIRST( &c->c_txn_ops )) != NULL ) {
int freevals = 1;
LDAP_STAILQ_REMOVE_HEAD( &c->c_txn_ops, o_next );
LDAP_STAILQ_NEXT( o, o_next ) = NULL;
switch ( o->o_tag ) {
case LDAP_REQ_ADD: {
if ( o->ora_e != NULL ) {
OpExtra *oex;
OpExtraDB *oexdb = NULL;
LDAP_SLIST_FOREACH(oex, &o->o_extra, oe_next) {
if ( oex->oe_key == (void *)do_add ) {
oexdb = (OpExtraDB *)oex;
break;
}
}
if ( oexdb && oexdb->oe_db ) {
BackendDB *bd = o->o_bd;
o->o_bd = oexdb->oe_db;
be_entry_release_w( o, o->ora_e );
o->ora_e = NULL;
o->o_bd = bd;
} else {
entry_free( o->ora_e );
}
if ( oexdb ) {
o->o_tmpfree( oexdb, o->o_tmpmemctx );
}
}
freevals = 0;
} /* fallthru */
case LDAP_REQ_MODIFY:
case LDAP_REQ_MODRDN:
if ( o->orr_modlist != NULL ) {
slap_mods_free( o->orr_modlist, freevals );
}
break;
case LDAP_REQ_DELETE:
case LDAP_REQ_EXTENDED:
break;
default:
assert( 0 );
}
o->o_tmpfree( o->o_req_dn.bv_val, o->o_tmpmemctx );
o->o_tmpfree( o->o_req_ndn.bv_val, o->o_tmpmemctx );
slap_op_free( o, NULL );
}