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

ITS#6758 back-bdb: Delay setting sr->sr_entry until we know it will be used

Browse Source
This commit is contained in:
Hallvard Furuseth 2010-12-31 00:04:38 +00:00
parent 1ea8de9fda
commit abf7f2efce
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servers/slapd/back-bdb/search.c
View File

@ -748,8 +748,6 @@ fetch_entry_retry:
goto loop_continue;
}
rs->sr_entry = e;
if ( is_entry_subentry( e ) ) {
if( op->oq_search.rs_scope != LDAP_SCOPE_BASE ) {
if(!get_subentries_visibility( op )) {
@ -881,6 +879,7 @@ fetch_entry_retry:
blis.bli_lock = lock;
blis.bli_flag = BLI_DONTFREE;
rs->sr_entry = e;
rs->sr_flags = REP_ENTRY_MUSTRELEASE;
send_search_reference( op, rs );
@ -912,7 +911,7 @@ fetch_entry_retry:
}
/* if it matches the filter and scope, send it */
rs->sr_err = test_filter( op, rs->sr_entry, op->oq_search.rs_filter );
rs->sr_err = test_filter( op, e, op->oq_search.rs_filter );
if ( rs->sr_err == LDAP_COMPARE_TRUE ) {
/* check size limit */
@ -956,10 +955,13 @@ fetch_entry_retry:
rs->sr_attrs = op->oq_search.rs_attrs;
rs->sr_operational_attrs = NULL;
rs->sr_ctrls = NULL;
rs->sr_entry = e;
RS_ASSERT( e->e_private != NULL );
rs->sr_flags = REP_ENTRY_MUSTRELEASE;
rs->sr_err = LDAP_SUCCESS;
rs->sr_err = send_search_entry( op, rs );
rs->sr_attrs = NULL;
rs->sr_entry = NULL;
/* send_search_entry will usually free it.
* an overlay might leave its own copy here;
@ -977,7 +979,6 @@ fetch_entry_retry:
OpExtra, oe_next );
}
}
rs->sr_entry = NULL;
e = NULL;
switch ( rs->sr_err ) {
@ -1013,6 +1014,7 @@ loop_continue:
slap_zn_runlock(bdb->bi_cache.c_zctx, e);
#endif
bdb_cache_return_entry_r( bdb, e , &lock );
RS_ASSERT( rs->sr_entry == NULL );
e = NULL;
rs->sr_entry = NULL;
}
@ -1327,4 +1329,3 @@ send_paged_response(
done:
(void) ber_free_buf( ber );
}