mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#5452,#8012: fix syncprov syncops freeing

Browse Source 
Detaching a syncops record from op-list conditionally,
only when it was freed by syncprov_free_syncop.

The syncprov_free_syncop() and syncprov_drop_psearch() now
returns a flag, which is nonzero if the given syncops was freed.
This commit is contained in:
Leo Yuriev 2015-01-04 07:27:16 +00:00 committed by Howard Chu
parent 0b2438fbec
commit 7c2951819f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
servers/slapd/overlays/syncprov.c
View File

@ -790,7 +790,7 @@ static int dec_mutexint( mutexint *mi )
return i;
}
static void
static int
syncprov_free_syncop( syncops *so )
{
syncres *sr, *srnext;
@ -800,7 +800,7 @@ syncprov_free_syncop( syncops *so )
/* already being freed, or still in use */
if ( !so->s_inuse || --so->s_inuse > 0 ) {
ldap_pvt_thread_mutex_unlock( &so->s_mutex );
return;
return 0;
}
ldap_pvt_thread_mutex_unlock( &so->s_mutex );
if ( so->s_flags & PS_IS_DETACHED ) {
@ -824,6 +824,7 @@ syncprov_free_syncop( syncops *so )
}
ldap_pvt_thread_mutex_destroy( &so->s_mutex );
ch_free( so );
return 1;
}
/* Send a persistent search response */
@ -1104,9 +1105,7 @@ syncprov_drop_psearch( syncops *so, int lock )
if ( lock )
ldap_pvt_thread_mutex_unlock( &so->s_op->o_conn->c_mutex );
}
syncprov_free_syncop( so );
return 0;
return syncprov_free_syncop( so );
}
static int
@ -1166,10 +1165,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
syncprov_info_t *si = on->on_bi.bi_private;
fbase_cookie fc;
syncops *ss, *sprev, *snext;
syncops **pss;
Entry *e = NULL;
Attribute *a;
int rc;
int rc, gonext;
struct berval newdn;
int freefdn = 0;
BackendDB *b0 = op->o_bd, db;
@ -1229,15 +1228,15 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
}
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss;
sprev = ss, ss=snext)
for (pss = &si->si_ops; *pss; pss = gonext ? &(*pss)->s_next : pss)
{
Operation op2;
Opheader oh;
syncmatches *sm;
int found = 0;
syncops *snext, *ss = *pss;
snext = ss->s_next;
gonext = 1;
if ( ss->s_op->o_abandon )
continue;
@ -1266,9 +1265,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
SlapReply rs = {REP_RESULT};
send_ldap_error( ss->s_op, &rs, LDAP_SYNC_REFRESH_REQUIRED,
"search base has changed" );
sprev->s_next = snext;
syncprov_drop_psearch( ss, 1 );
ss = sprev;
snext = ss->s_next;
if ( syncprov_drop_psearch( ss, 1 ) )
*pss = snext;
gonext = 0;
continue;
}
@ -1342,7 +1342,11 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
/* Decrement s_inuse, was incremented when called
* with saveit == TRUE
*/
syncprov_free_syncop( ss );
snext = ss->s_next;
if ( syncprov_free_syncop( ss ) ) {
*pss = snext;
gonext = 0;
}
}
}
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );