pxcloud/guacamole-server
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUACAMOLE-1846: Merge check for NULLs before attempting to sync state in join pending handlers.

Browse Source
This commit is contained in:
Virtually Nick 2023-09-30 15:30:57 -04:00 committed by GitHub
commit 4e1983a338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/protocols/kubernetes/client.c
View File

@ -95,10 +95,12 @@ static int guac_kubernetes_join_pending_handler(guac_client* client) {
(guac_kubernetes_client*) client->data;
/* Synchronize the terminal state to all pending users */
guac_socket* broadcast_socket = client->pending_socket;
guac_terminal_sync_users(kubernetes_client->term, client, broadcast_socket);
guac_kubernetes_send_current_argv_batch(client, broadcast_socket);
guac_socket_flush(broadcast_socket);
if (kubernetes_client->term != NULL) {
guac_socket* broadcast_socket = client->pending_socket;
guac_terminal_sync_users(kubernetes_client->term, client, broadcast_socket);
guac_kubernetes_send_current_argv_batch(client, broadcast_socket);
guac_socket_flush(broadcast_socket);
}
return 0;

7
src/protocols/rdp/client.c
View File

@ -125,9 +125,10 @@ static int guac_rdp_join_pending_handler(guac_client* client) {
guac_rdp_pipe_svc_send_pipes(client, broadcast_socket);
/* Synchronize with current display */
guac_common_display_dup(rdp_client->display, client, broadcast_socket);
guac_socket_flush(broadcast_socket);
if (rdp_client->display != NULL) {
guac_common_display_dup(rdp_client->display, client, broadcast_socket);
guac_socket_flush(broadcast_socket);
}
return 0;

10
src/protocols/ssh/client.c
View File

@ -52,10 +52,12 @@ static int guac_ssh_join_pending_handler(guac_client* client) {
guac_ssh_client* ssh_client = (guac_ssh_client*) client->data;
/* Synchronize the terminal state to all pending users */
guac_socket* broadcast_socket = client->pending_socket;
guac_terminal_sync_users(ssh_client->term, client, broadcast_socket);
guac_ssh_send_current_argv_batch(client, broadcast_socket);
guac_socket_flush(broadcast_socket);
if (ssh_client->term != NULL) {
guac_socket* broadcast_socket = client->pending_socket;
guac_terminal_sync_users(ssh_client->term, client, broadcast_socket);
guac_ssh_send_current_argv_batch(client, broadcast_socket);
guac_socket_flush(broadcast_socket);
}
return 0;

10
src/protocols/telnet/client.c
View File

@ -51,10 +51,12 @@ static int guac_telnet_join_pending_handler(guac_client* client) {
guac_telnet_client* telnet_client = (guac_telnet_client*) client->data;
/* Synchronize the terminal state to all pending users */
guac_socket* broadcast_socket = client->pending_socket;
guac_terminal_sync_users(telnet_client->term, client, broadcast_socket);
guac_telnet_send_current_argv_batch(client, broadcast_socket);
guac_socket_flush(broadcast_socket);
if (telnet_client->term != NULL) {
guac_socket* broadcast_socket = client->pending_socket;
guac_terminal_sync_users(telnet_client->term, client, broadcast_socket);
guac_telnet_send_current_argv_batch(client, broadcast_socket);
guac_socket_flush(broadcast_socket);
}
return 0;

6
src/protocols/vnc/client.c
View File

@ -87,8 +87,10 @@ static int guac_vnc_join_pending_handler(guac_client* client) {
#endif
/* Synchronize with current display */
guac_common_display_dup(vnc_client->display, client, broadcast_socket);
guac_socket_flush(broadcast_socket);
if (vnc_client->display != NULL) {
guac_common_display_dup(vnc_client->display, client, broadcast_socket);
guac_socket_flush(broadcast_socket);
}
return 0;