upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-28 02:29:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#10151 Make sure we release scratch objects on "error"

Browse source
This commit is contained in:
Ondřej Kuzník 2024-01-05 12:48:01 +00:00 committed by Quanah Gibson-Mount
parent 212fdc5196
commit b8999d165c
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/slapd/syncrepl.c
View file

@ -1448,6 +1448,8 @@ do_syncrep2(
"got search entry without "
"Sync State control (%s)\n", si->si_ridtxt, bdn.bv_val );
rc = -1;
if ( rctrls )
ldap_controls_free( rctrls );
goto done;
}
ber_init2( ber, &rctrlp->ldctl_value, LBER_USE_DER );
@ -1505,8 +1507,10 @@ do_syncrep2(
si->si_too_old = 0;
/* check pending CSNs too */
if (( rc = get_pmutex( si )))
if (( rc = get_pmutex( si ))) {
ldap_controls_free( rctrls );
goto done;
}
i = check_csn_age( si, &bdn, syncCookie.ctxcsn, sid, (cookie_vals *)&si->si_cookieState->cs_pvals, &slot );
if ( i == CV_CSN_OK ) {
@ -1570,8 +1574,12 @@ logerr:
&modlist, &entry, syncstate, syncUUID ) ) == LDAP_SUCCESS )
{
if ( punlock < 0 ) {
if (( rc = get_pmutex( si )))
if (( rc = get_pmutex( si ))) {
ldap_controls_free( rctrls );
slap_mods_free( modlist, 1 );
entry_free( entry );
goto done;
}
}
if ( ( rc = syncrepl_entry( si, op, entry, &modlist,
syncstate, syncUUID, syncCookie.ctxcsn ) ) == LDAP_SUCCESS &&