ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Correct SSL lock size and make sure we free as many as we allocated. 

Found by valgrind.
This commit is contained in:
Hans Leidekker 2009-10-21 13:18:43 +02:00 committed by Alexandre Julliard
parent 7c59b46890
commit 6732d5dfd7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/winhttp/net.c
View File

@ -120,6 +120,7 @@ MAKE_FUNCPTR( i2d_X509 );
#undef MAKE_FUNCPTR #undef MAKE_FUNCPTR
static CRITICAL_SECTION *ssl_locks; static CRITICAL_SECTION *ssl_locks;
static unsigned int num_ssl_locks;
static unsigned long ssl_thread_id(void) static unsigned long ssl_thread_id(void)
{ {
@ -290,16 +291,15 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
} }
pCRYPTO_set_id_callback(ssl_thread_id); pCRYPTO_set_id_callback(ssl_thread_id);
ssl_locks = HeapAlloc(GetProcessHeap(), 0, num_ssl_locks = pCRYPTO_num_locks();
pCRYPTO_num_locks() * sizeof(HANDLE)); ssl_locks = HeapAlloc(GetProcessHeap(), 0, num_ssl_locks * sizeof(CRITICAL_SECTION));
if (!ssl_locks) if (!ssl_locks)
{ {
set_last_error( ERROR_OUTOFMEMORY ); set_last_error( ERROR_OUTOFMEMORY );
LeaveCriticalSection( &init_ssl_cs ); LeaveCriticalSection( &init_ssl_cs );
return FALSE; return FALSE;
} }
for (i = 0; i < pCRYPTO_num_locks(); i++) for (i = 0; i < num_ssl_locks; i++) InitializeCriticalSection( &ssl_locks[i] );
InitializeCriticalSection( &ssl_locks[i] );
pCRYPTO_set_locking_callback(ssl_lock_callback); pCRYPTO_set_locking_callback(ssl_lock_callback);
LeaveCriticalSection( &init_ssl_cs ); LeaveCriticalSection( &init_ssl_cs );
@ -320,8 +320,7 @@ void netconn_unload( void )
{ {
int i; int i;
for (i = 0; i < pCRYPTO_num_locks(); i++) for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] );
DeleteCriticalSection( &ssl_locks[i] );
HeapFree( GetProcessHeap(), 0, ssl_locks ); HeapFree( GetProcessHeap(), 0, ssl_locks );
} }
wine_dlclose( libcrypto_handle, NULL, 0 ); wine_dlclose( libcrypto_handle, NULL, 0 );