upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-03 20:40:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6793 Fix back-ldap bad free on matchedDN change

Browse source
This commit is contained in:
Hallvard Furuseth 2011-01-17 10:55:41 +00:00
parent e3f344bcbd
commit 3866da50f5
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
servers/slapd/back-ldap/search.c
View file

@ -169,9 +169,7 @@ ldap_back_search(
int do_retry = 1, dont_retry = 0;
LDAPControl **ctrls = NULL;
char **references = NULL;
/* FIXME: shouldn't this be null? */
const char *save_matched = rs->sr_matched;
void *matchctx = NULL;
rs_assert_ready( rs );
rs->sr_flags &= ~REP_ENTRY_MASK; /* paranoia, we can set rs = non-entry */
@ -579,12 +577,11 @@ retry:
struct berval pmatch;
if ( dnPretty( NULL, &match, &pmatch, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
rs->sr_matched = pmatch.bv_val;
ber_memfree( match.bv_val );
} else {
rs->sr_matched = match.bv_val;
matchctx = op->o_tmpmemctx;
match.bv_val = pmatch.bv_val;
}
rs->sr_matched = match.bv_val;
}
if ( rs->sr_v2ref ) {
@ -615,15 +612,10 @@ finish:;
rs->sr_ctrls = NULL;
}
if ( rs->sr_matched != NULL && rs->sr_matched != save_matched ) {
if ( rs->sr_matched != match.bv_val ) {
ber_memfree_x( (char *)rs->sr_matched, op->o_tmpmemctx );
} else {
ber_memfree( match.bv_val );
}
rs->sr_matched = save_matched;
if ( match.bv_val ) {
ber_memfree_x( match.bv_val, matchctx );
}
rs->sr_matched = NULL;
if ( rs->sr_text ) {
if ( freetext ) {