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

Fixing leak in client init - GUACIO must be closed (and thus free'd) on init error

Browse Source
This commit is contained in:
Michael Jumper 2010-12-22 02:04:09 -08:00
parent c9c2295dbd
commit 62a886d258
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libguac/src/client.c
View File

@ -98,6 +98,7 @@ guac_client* guac_get_client(int client_fd) {
int result = guac_read_instruction(io, &instruction); int result = guac_read_instruction(io, &instruction);
if (result < 0) { if (result < 0) {
syslog(LOG_ERR, "Error reading instruction while waiting for connect"); syslog(LOG_ERR, "Error reading instruction while waiting for connect");
guac_close(io);
return NULL; return NULL;
} }
@ -121,6 +122,7 @@ guac_client* guac_get_client(int client_fd) {
syslog(LOG_ERR, "Could not open client plugin for protocol \"%s\": %s\n", protocol, dlerror()); syslog(LOG_ERR, "Could not open client plugin for protocol \"%s\": %s\n", protocol, dlerror());
guac_send_error(io, "Could not load server-side client plugin."); guac_send_error(io, "Could not load server-side client plugin.");
guac_flush(io); guac_flush(io);
guac_close(io);
guac_free_instruction_data(&instruction); guac_free_instruction_data(&instruction);
return NULL; return NULL;
} }
@ -134,6 +136,7 @@ guac_client* guac_get_client(int client_fd) {
syslog(LOG_ERR, "Could not get guac_client_init in plugin: %s\n", error); syslog(LOG_ERR, "Could not get guac_client_init in plugin: %s\n", error);
guac_send_error(io, "Invalid server-side client plugin."); guac_send_error(io, "Invalid server-side client plugin.");
guac_flush(io); guac_flush(io);
guac_close(io);
guac_free_instruction_data(&instruction); guac_free_instruction_data(&instruction);
return NULL; return NULL;
} }
@ -145,6 +148,7 @@ guac_client* guac_get_client(int client_fd) {
if (alias.client_init(client, argc, argv) != 0) { if (alias.client_init(client, argc, argv) != 0) {
/* NOTE: On error, proxy client will send appropriate error message */ /* NOTE: On error, proxy client will send appropriate error message */
guac_free_instruction_data(&instruction); guac_free_instruction_data(&instruction);
guac_close(io);
return NULL; return NULL;
} }