mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-fix ITS#6793 (back-ldap bad free of matchedDN).

Browse Source 
Previous fix opened for a ITS#6758-style double free if the
caller was broken.  Using REP_MATCHED_MUSTBEFREED is more robust.
This commit is contained in:
Hallvard Furuseth 2011-01-31 05:30:05 +00:00
parent f6871370f4
commit 4064e3c15d
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
servers/slapd/back-ldap/search.c
View File

@ -147,7 +147,6 @@ ldap_back_search(
int do_retry = 1, dont_retry = 0;
LDAPControl **ctrls = NULL;
char **references = NULL;
void *matchctx = NULL;
rs_assert_ready( rs );
rs->sr_flags &= ~REP_ENTRY_MASK; /* paranoia, we can set rs = non-entry */
@ -569,12 +568,15 @@ retry:
if ( !BER_BVISNULL( &match ) && !BER_BVISEMPTY( &match ) ) {
struct berval pmatch;
if ( dnPretty( NULL, &match, &pmatch, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
ber_memfree( match.bv_val );
matchctx = op->o_tmpmemctx;
match.bv_val = pmatch.bv_val;
if ( dnPretty( NULL, &match, &pmatch, op->o_tmpmemctx ) != LDAP_SUCCESS ) {
pmatch.bv_val = match.bv_val;
match.bv_val = NULL;
}
rs->sr_matched = match.bv_val;
rs->sr_matched = pmatch.bv_val;
rs->sr_flags |= REP_MATCHED_MUSTBEFREED;
}
if ( !BER_BVISNULL( &match ) ) {
ber_memfree( match.bv_val );
}
if ( rs->sr_v2ref ) {
@ -605,11 +607,6 @@ finish:;
rs->sr_ctrls = NULL;
}
if ( match.bv_val ) {
ber_memfree_x( match.bv_val, matchctx );
}
rs->sr_matched = NULL;
if ( rs->sr_text ) {
if ( freetext ) {
ber_memfree( (char *)rs->sr_text );