Commit d3d291db authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#7662 cleanup reader txn in mdb_entry_get()

parent 6081a7c8
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment