Skip to content

GUACAMOLE-2221: fix RDP busy-loop on transport failure #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mike-jumper merged 1 commit into from
Mar 31, 2026
+7 −1
Merged

GUACAMOLE-2221: fix RDP busy-loop on transport failure #635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/protocols/rdp/rdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,10 @@ static int rdp_guac_client_wait_for_events(guac_client* client,

}

/* Bail out if FreeRDP has recorded a connection error */
if (freerdp_get_last_error(GUAC_RDP_CONTEXT(rdp_inst)) != FREERDP_ERROR_SUCCESS)
return -1;

/* Wait was successful */
return 1;

Expand Down Expand Up @@ -625,8 +629,10 @@ static int guac_rdp_handle_connection(guac_client* client) {

/* Handle any queued FreeRDP events (this may result in RDP messages
* being sent), aborting later if FreeRDP event handling fails */
if (!guac_rdp_handle_events(rdp_client))
if (!guac_rdp_handle_events(rdp_client)) {
wait_result = -1;
break;
}

/* Test whether the RDP server is closing the connection */
#ifdef HAVE_DISCONNECT_CONTEXT
Expand Down
Loading