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

ITS#7967 fix abandon regression

Browse Source 
From ITS#7712, avoid double-free of request
This commit is contained in:
Howard Chu 2014-10-15 11:08:29 +01:00
parent b0e46fb9f9
commit b36bd703d7
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/libldap/abandon.c
View File

@ -278,23 +278,29 @@ start_again:;
}
if ( lr != NULL ) {
LDAPConn *lc;
int freeconn = 0;
if ( sendabandon || lr->lr_status == LDAP_REQST_WRITING ) {
/* release ld_req_mutex while grabbing ld_conn_mutex to
* prevent deadlock.
*/
LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex );
LDAP_MUTEX_LOCK( &ld->ld_conn_mutex );
ldap_free_connection( ld, lr->lr_conn, 0, 1 );
LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex );
LDAP_MUTEX_LOCK( &ld->ld_req_mutex );
freeconn = 1;
lc = lr->lr_conn;
}
if ( origid == msgid ) {
ldap_free_request( ld, lr );
} else {
lr->lr_abandoned = 1;
}
if ( freeconn ) {
/* release ld_req_mutex while grabbing ld_conn_mutex to
* prevent deadlock.
*/
LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex );
LDAP_MUTEX_LOCK( &ld->ld_conn_mutex );
ldap_free_connection( ld, lc, 0, 1 );
LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex );
LDAP_MUTEX_LOCK( &ld->ld_req_mutex );
}
}
LDAP_MUTEX_LOCK( &ld->ld_abandon_mutex );