This is an automated email from the git hooks/post-receive script. tbordaz pushed a commit to branch 389-ds-base-1.3.10 in repository 389-ds-base. The following commit(s) were added to refs/heads/389-ds-base-1.3.10 by this push: new dab015b Ticket 50709: (cont) Several memory leaks reported by Valgrind for 389-ds 1.3.9.1-10 dab015b is described below commit dab015b9504b3d452504156f31762983c17f92f0 Author: Thierry Bordaz <tbordaz(a)redhat.com&gt; AuthorDate: Fri Jan 24 10:56:23 2020 +0100 Ticket 50709: (cont) Several memory leaks reported by Valgrind for 389-ds 1.3.9.1-10 Bug Description: Cherry pick from master was broken because connection locking uses pthread lock in master while it remains Monitor in 1.3.10 Fix Description: Change the locking function to use Monitor in that branch https://pagure.io/389-ds-base/issue/50709 Reviewed by: thierry bordaz Platforms tested: 7.8 Flag Day: no Doc impact: no --- ldap/servers/slapd/pblock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c index d2ad614..d21cf7e 100644 --- a/ldap/servers/slapd/pblock.c +++ b/ldap/servers/slapd/pblock.c @@ -486,9 +486,9 @@ slapi_pblock_get(Slapi_PBlock *pblock, int arg, void *value) if (pblock->pb_conn == NULL) { break; } - pthread_mutex_lock(&(pblock->pb_conn->c_mutex)); + PR_EnterMonitor(pblock->pb_conn->c_mutex); (*(PRNetAddr **) value) = pblock->pb_conn->cin_addr_aclip; - pthread_mutex_unlock(&(pblock->pb_conn->c_mutex)); + PR_ExitMonitor(pblock->pb_conn->c_mutex); break; case SLAPI_CONN_SERVERNETADDR: if (pblock->pb_conn == NULL) { @@ -2583,10 +2583,10 @@ slapi_pblock_set(Slapi_PBlock *pblock, int arg, void *value) if (pblock->pb_conn == NULL) { break; } - pthread_mutex_lock(&(pblock->pb_conn->c_mutex)); + PR_EnterMonitor(pblock->pb_conn->c_mutex); slapi_ch_free((void **)&pblock->pb_conn->cin_addr_aclip); pblock->pb_conn->cin_addr_aclip = (PRNetAddr *)value; - pthread_mutex_unlock(&(pblock->pb_conn->c_mutex)); + PR_ExitMonitor(pblock->pb_conn->c_mutex); case SLAPI_CONN_IS_REPLICATION_SESSION: if (pblock->pb_conn == NULL) { slapi_log_err(SLAPI_LOG_ERR, -- To stop receiving notification emails like this one, please contact the administrator of this repository.