upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9181 Fix race on Windows mutex init

Browse source
This commit is contained in:
Howard Chu 2020-03-16 17:07:43 +00:00
parent 2d87a1c7b5
commit 4f7ea78c95
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/ldap_int_thread.h
View file

@ -152,10 +152,13 @@ typedef HANDLE ldap_int_thread_mutex_t;
typedef HANDLE ldap_int_thread_cond_t; typedef HANDLE ldap_int_thread_cond_t;
typedef DWORD ldap_int_thread_key_t; typedef DWORD ldap_int_thread_key_t;
LDAP_F( int )
ldap_pvt_thread_mutex_init_first LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
#ifndef LDAP_INT_MUTEX_NULL #ifndef LDAP_INT_MUTEX_NULL
#define LDAP_INT_MUTEX_NULL ((HANDLE)0) #define LDAP_INT_MUTEX_NULL ((HANDLE)0)
#define LDAP_INT_MUTEX_FIRSTCREATE(m) \ #define LDAP_INT_MUTEX_FIRSTCREATE(m) \
((void) ((m) || ldap_pvt_thread_mutex_init(&(m)))) ldap_pvt_thread_mutex_init_first(&(m))
#endif #endif
LDAP_END_DECL LDAP_END_DECL

11
libraries/libldap_r/thr_nt.c
View file

@ -161,6 +161,17 @@ ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
return ( 0 ); return ( 0 );
} }
int
ldap_pvt_thread_mutex_init_first( ldap_pvt_thread_mutex_t *mutex )
{
if ( *mutex == NULL ) {
HANDLE p = CreateMutex( NULL, 0, NULL );
if ( InterlockedCompareExchangePointer((PVOID*)mutex, (PVOID)p, NULL) != NULL)
CloseHandle( p );
}
return ( 0 );
}
int int
ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_t *mutex ) ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_t *mutex )
{ {