You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/01/11 23:10:05 UTC
[1/3] incubator-guacamole-server git commit: Merge 0.9.11-incubating
changes back to master.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/staging/0.9.11-incubating 1fef1f446 -> cf9aeef83
Merge 0.9.11-incubating changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/6d4b7a94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/6d4b7a94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/6d4b7a94
Branch: refs/heads/staging/0.9.11-incubating
Commit: 6d4b7a94f668b6a0e9cf07da177f680ef97da43e
Parents: e0e42e8 1fef1f4
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Jan 10 13:25:11 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Jan 10 13:25:11 2017 -0800
----------------------------------------------------------------------
bin/guacctl | 2 +-
configure.ac | 2 +-
doc/Doxyfile | 2 +-
src/guacd/man/guacd.8 | 2 +-
src/guacd/man/guacd.conf.5 | 2 +-
src/guacenc/man/guacenc.1 | 2 +-
src/libguac/Makefile.am | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-guacamole-server git commit: GUACAMOLE-157: Merge fix
for segfault upon VNC disconnect.
Posted by mj...@apache.org.
GUACAMOLE-157: Merge fix for segfault upon VNC disconnect.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/cf9aeef8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/cf9aeef8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/cf9aeef8
Branch: refs/heads/staging/0.9.11-incubating
Commit: cf9aeef83b4499ac54ae9a22ab222a9e867e91e5
Parents: 1fef1f4 6c05dc0
Author: Michael Jumper <mj...@apache.org>
Authored: Wed Jan 11 15:09:15 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Wed Jan 11 15:09:15 2017 -0800
----------------------------------------------------------------------
src/common-ssh/guac_ssh.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-guacamole-server git commit: GUACAMOLE-157:
Initialize SSH SSL lock array to NULL and test for NULL-ness before freeing.
Posted by mj...@apache.org.
GUACAMOLE-157: Initialize SSH SSL lock array to NULL and test for NULL-ness before freeing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/6c05dc02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/6c05dc02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/6c05dc02
Branch: refs/heads/staging/0.9.11-incubating
Commit: 6c05dc026e300a8c73fe7b7ae204026f2d596e86
Parents: 6d4b7a9
Author: Frode Langelo <fr...@apache.org>
Authored: Wed Jan 11 22:40:34 2017 +0000
Committer: Frode Langelo <fr...@apache.org>
Committed: Wed Jan 11 22:40:34 2017 +0000
----------------------------------------------------------------------
src/common-ssh/guac_ssh.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/6c05dc02/src/common-ssh/guac_ssh.c
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh.c b/src/common-ssh/guac_ssh.c
index 2c59e1d..488eea2 100644
--- a/src/common-ssh/guac_ssh.c
+++ b/src/common-ssh/guac_ssh.c
@@ -48,7 +48,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
/**
* 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.
@@ -103,7 +103,7 @@ static void guac_common_ssh_openssl_init_locks(int count) {
/* Allocate required number of locks */
guac_common_ssh_openssl_locks =
- malloc(sizeof(pthread_mutex_t) * CRYPTO_num_locks());
+ malloc(sizeof(pthread_mutex_t) * count);
/* Initialize each lock */
for (i=0; i < count; i++)
@@ -121,6 +121,10 @@ static void guac_common_ssh_openssl_free_locks(int count) {
int i;
+ /* SSL lock array was not initialized */
+ if (guac_common_ssh_openssl_locks == NULL)
+ return;
+
/* Free all locks */
for (i=0; i < count; i++)
pthread_mutex_destroy(&(guac_common_ssh_openssl_locks[i]));