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

Unlock lock properly.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-28 11:30:17 -07:00
parent ce759ccbe6
commit 4b6aa01517
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/protocols/rdp/guac_handlers.c
View File

@ -187,6 +187,7 @@ int rdp_guac_client_handle_messages(guac_client* client) {
if (!freerdp_check_fds(rdp_inst)) { if (!freerdp_check_fds(rdp_inst)) {
guac_error = GUAC_STATUS_BAD_STATE; guac_error = GUAC_STATUS_BAD_STATE;
guac_error_message = "Error handling RDP file descriptors"; guac_error_message = "Error handling RDP file descriptors";
pthread_mutex_unlock(&(guac_client_data->rdp_lock));
return 1; return 1;
} }
@ -194,6 +195,7 @@ int rdp_guac_client_handle_messages(guac_client* client) {
if (!freerdp_channels_check_fds(channels, rdp_inst)) { if (!freerdp_channels_check_fds(channels, rdp_inst)) {
guac_error = GUAC_STATUS_BAD_STATE; guac_error = GUAC_STATUS_BAD_STATE;
guac_error_message = "Error handling RDP channel file descriptors"; guac_error_message = "Error handling RDP channel file descriptors";
pthread_mutex_unlock(&(guac_client_data->rdp_lock));
return 1; return 1;
} }
@ -218,6 +220,7 @@ int rdp_guac_client_handle_messages(guac_client* client) {
if (freerdp_shall_disconnect(rdp_inst)) { if (freerdp_shall_disconnect(rdp_inst)) {
guac_error = GUAC_STATUS_NO_INPUT; guac_error = GUAC_STATUS_NO_INPUT;
guac_error_message = "RDP server closed connection"; guac_error_message = "RDP server closed connection";
pthread_mutex_unlock(&(guac_client_data->rdp_lock));
return 1; return 1;
} }
@ -248,6 +251,8 @@ int rdp_guac_client_handle_messages(guac_client* client) {
FD_SET(fd, &wfds); FD_SET(fd, &wfds);
} }
pthread_mutex_unlock(&(guac_client_data->rdp_lock));
} while (select(max_fd + 1, &rfds, &wfds, NULL, &timeout) > 0); } while (select(max_fd + 1, &rfds, &wfds, NULL, &timeout) > 0);
/* Success */ /* Success */