maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 0.9.11-incubating changes back to master.

Browse Source
This commit is contained in:
Michael Jumper 2017-01-11 15:11:11 -08:00
commit 0611bd1c45
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common-ssh/guac_ssh.c
View File

@ -48,7 +48,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
/** /**
* Array of mutexes, used by OpenSSL. * Array of mutexes, used by OpenSSL.
*/ */
static pthread_mutex_t* guac_common_ssh_openssl_locks; static pthread_mutex_t* guac_common_ssh_openssl_locks = NULL;
/** /**
* Called by OpenSSL when locking or unlocking the Nth mutex. * Called by OpenSSL when locking or unlocking the Nth mutex.
@ -103,7 +103,7 @@ static void guac_common_ssh_openssl_init_locks(int count) {
/* Allocate required number of locks */ /* Allocate required number of locks */
guac_common_ssh_openssl_locks = guac_common_ssh_openssl_locks =
malloc(sizeof(pthread_mutex_t) * CRYPTO_num_locks()); malloc(sizeof(pthread_mutex_t) * count);
/* Initialize each lock */ /* Initialize each lock */
for (i=0; i < count; i++) for (i=0; i < count; i++)
@ -121,6 +121,10 @@ static void guac_common_ssh_openssl_free_locks(int count) {
int i; int i;
/* SSL lock array was not initialized */
if (guac_common_ssh_openssl_locks == NULL)
return;
/* Free all locks */ /* Free all locks */
for (i=0; i < count; i++) for (i=0; i < count; i++)
pthread_mutex_destroy(&(guac_common_ssh_openssl_locks[i])); pthread_mutex_destroy(&(guac_common_ssh_openssl_locks[i]));