ITS#7662 cleanup reader txn in mdb_entry_get()

This commit is contained in:
Howard Chu 2013-08-10 05:05:16 -07:00
parent 19737680d1
commit 64f06d5acc

View File

@ -242,6 +242,8 @@ int mdb_entry_return(
Entry *e
)
{
if ( !e )
return 0;
if ( e->e_private ) {
if ( op->o_hdr ) {
op->o_tmpfree( e->e_nname.bv_val, op->o_tmpmemctx );
@ -363,14 +365,7 @@ int mdb_entry_get(
return_results:
if( rc != LDAP_SUCCESS ) {
/* free entry */
if ( e )
mdb_entry_return( op, e );
if (moi->moi_ref == 1) {
LDAP_SLIST_REMOVE( &op->o_extra, &moi->moi_oe, OpExtra, oe_next );
mdb_txn_reset( txn );
op->o_tmpfree( moi, op->o_tmpmemctx );
}
mdb_entry_release( op, e, rw );
} else {
*ent = e;
}