You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2019/01/07 11:35:10 UTC
[2/3] guacamole-server git commit: GUACAMOLE-662: Properly initialize
nested socket index (fixes GUACAMOLE-510).
GUACAMOLE-662: Properly initialize nested socket index (fixes GUACAMOLE-510).
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/47ad6f4b
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/47ad6f4b
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/47ad6f4b
Branch: refs/heads/master
Commit: 47ad6f4b59dc861ae8f17e41885c7f2947ff2bad
Parents: aba7b98
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Jan 6 15:43:55 2019 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Jan 6 17:09:35 2019 -0800
----------------------------------------------------------------------
src/libguac/socket-nest.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/47ad6f4b/src/libguac/socket-nest.c
----------------------------------------------------------------------
diff --git a/src/libguac/socket-nest.c b/src/libguac/socket-nest.c
index 6acac7d..0c7d471 100644
--- a/src/libguac/socket-nest.c
+++ b/src/libguac/socket-nest.c
@@ -129,8 +129,9 @@ guac_socket* guac_socket_nest(guac_socket* parent, int index) {
guac_socket* socket = guac_socket_alloc();
__guac_socket_nest_data* data = malloc(sizeof(__guac_socket_nest_data));
- /* Store file descriptor as socket data */
+ /* Store nested socket details as socket data */
data->parent = parent;
+ data->index = index;
socket->data = data;
/* Set write and free handlers */