safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Threads

Browse Source
This commit is contained in:
Michael Jumper
2010-09-18 12:39:57 -07:00
parent 709911059e
commit 26d1cba7cb
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole/libguac/client.c
View File

@@ -190,6 +190,14 @@ guac_client* guac_get_client(int client_fd, guac_client_registry_node* registry,
GUACIO* io = guac_open(client_fd);
guac_instruction instruction;
/* Make copies of arguments */
char** safe_argv = malloc(argc * sizeof(char*));
char** scratch_argv = malloc(argc * sizeof(char*));
int i;
for (i=0; i<argc; i++)
scratch_argv[i] = safe_argv[i] = strdup(argv[i]);
/* Wait for handshaking messages */
for (;;) {
@@ -213,8 +221,7 @@ guac_client* guac_get_client(int client_fd, guac_client_registry_node* registry,
guac_flush(client->io);
}
/* FIXME: hostname and port should not be required. Should be made available in some sort of client-contained argc/argv, specified after the protocol on the commandline */
client_init(client, argc, argv);
client_init(client, argc, scratch_argv);
break;
}
@@ -261,6 +268,13 @@ guac_client* guac_get_client(int client_fd, guac_client_registry_node* registry,
}
/* Free memory used for arg copy */
for (i=0; i<argc; i++)
free(safe_argv[i]);
free(safe_argv);
free(scratch_argv);
return client;
}