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

Merge pull request #114 from glyptodon/fix-proc-free

Browse Source 
GUAC-1389: Ensure proc is freed and cleaned up, regardless of whether it started properly.
This commit is contained in:
James Muehlner 2016-03-03 11:13:59 -08:00
commit 63e9f2bc34
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/guacd/connection.c
View File

@ -160,9 +160,9 @@ void* guacd_connection_io_thread(void* data) {
/** /**
* Adds the given socket as a new user to the given process, automatically * Adds the given socket as a new user to the given process, automatically
* reading/writing from the socket via read/write threads. The given socket and * reading/writing from the socket via read/write threads. The given socket,
* any associated resources will be freed unless the user is not added * parser, and any associated resources will be freed unless the user is not
* successfully. * added successfully.
* *
* If adding the user fails for any reason, non-zero is returned. Zero is * If adding the user fails for any reason, non-zero is returned. Zero is
* returned upon success. * returned upon success.
@ -278,25 +278,31 @@ static int guacd_route_connection(guacd_proc_map* map, guac_socket* socket) {
if (identifier[0] == GUAC_CLIENT_ID_PREFIX) { if (identifier[0] == GUAC_CLIENT_ID_PREFIX) {
proc = guacd_proc_map_retrieve(map, identifier); proc = guacd_proc_map_retrieve(map, identifier);
if (proc == NULL)
guacd_log(GUAC_LOG_INFO, "Connection \"%s\" does not exist.", identifier);
else
guacd_log(GUAC_LOG_INFO, "Joining existing connection \"%s\"", identifier);
new_process = 0; new_process = 0;
/* Warn if requested connection does not exist */
if (proc == NULL)
guacd_log(GUAC_LOG_INFO, "Connection \"%s\" does not exist.",
identifier);
else
guacd_log(GUAC_LOG_INFO, "Joining existing connection \"%s\"",
identifier);
} }
/* Otherwise, create new client */ /* Otherwise, create new client */
else { else {
guacd_log(GUAC_LOG_INFO, "Creating new client for protocol \"%s\"", identifier); guacd_log(GUAC_LOG_INFO, "Creating new client for protocol \"%s\"",
proc = guacd_create_proc(identifier); identifier);
/* Create new process */
proc = guacd_create_proc(identifier);
new_process = 1; new_process = 1;
} }
/* Abort if no process exists for the requested connection */
if (proc == NULL) { if (proc == NULL) {
guacd_log_guac_error(GUAC_LOG_INFO, "Connection did not succeed"); guacd_log_guac_error(GUAC_LOG_INFO, "Connection did not succeed");
guac_parser_free(parser); guac_parser_free(parser);
@ -304,13 +310,17 @@ static int guacd_route_connection(guacd_proc_map* map, guac_socket* socket) {
} }
/* Add new user (in the case of a new process, this will be the owner */ /* Add new user (in the case of a new process, this will be the owner */
if (guacd_add_user(proc, parser, socket) == 0) { int add_user_failed = guacd_add_user(proc, parser, socket);
/* If new process was created, manage that process */ /* If new process was created, manage that process */
if (new_process) { if (new_process) {
/* The new process will only be active if the user was added */
if (!add_user_failed) {
/* Log connection ID */ /* Log connection ID */
guacd_log(GUAC_LOG_INFO, "Connection ID is \"%s\"", proc->client->connection_id); guacd_log(GUAC_LOG_INFO, "Connection ID is \"%s\"",
proc->client->connection_id);
/* Store process, allowing other users to join */ /* Store process, allowing other users to join */
guacd_proc_map_add(map, proc); guacd_proc_map_add(map, proc);
@ -320,10 +330,21 @@ static int guacd_route_connection(guacd_proc_map* map, guac_socket* socket) {
/* Remove client */ /* Remove client */
if (guacd_proc_map_remove(map, proc->client->connection_id) == NULL) if (guacd_proc_map_remove(map, proc->client->connection_id) == NULL)
guacd_log(GUAC_LOG_ERROR, "Internal failure removing client \"%s\". Client record will never be freed.", guacd_log(GUAC_LOG_ERROR, "Internal failure removing "
"client \"%s\". Client record will never be freed.",
proc->client->connection_id); proc->client->connection_id);
else else
guacd_log(GUAC_LOG_INFO, "Connection \"%s\" removed.", proc->client->connection_id); guacd_log(GUAC_LOG_INFO, "Connection \"%s\" removed.",
proc->client->connection_id);
}
/* Parser must be manually freed if the process did not start */
else
guac_parser_free(parser);
/* Force process to stop and clean up */
guacd_proc_stop(proc);
/* Free skeleton client */ /* Free skeleton client */
guac_client_free(proc->client); guac_client_free(proc->client);
@ -334,14 +355,8 @@ static int guacd_route_connection(guacd_proc_map* map, guac_socket* socket) {
} }
return 0; /* Routing succeeded only if the user was added to a process */
} return add_user_failed;
/* Add of user failed */
else {
guac_parser_free(parser);
return 1;
}
} }