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

GUAC-363: Warn of invalid preconnection IDs.

Browse Source
This commit is contained in:
Michael Jumper 2015-11-03 15:41:28 -08:00
parent b47cff044e
commit 5d608b3500
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/protocols/rdp/client.c
View File

@ -780,11 +780,23 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Preconnection ID */ /* Preconnection ID */
settings->preconnection_id = -1; settings->preconnection_id = -1;
if (argv[IDX_PRECONNECTION_ID][0] != '\0') { if (argv[IDX_PRECONNECTION_ID][0] != '\0') {
settings->preconnection_id = atoi(argv[IDX_PRECONNECTION_ID]);
/* Parse preconnection ID, warn if invalid */
int preconnection_id = atoi(argv[IDX_PRECONNECTION_ID]);
if (preconnection_id < 0)
guac_client_log(client, GUAC_LOG_WARNING,
"Ignoring invalid preconnection ID: %i",
preconnection_id);
/* Otherwise, assign specified ID */
else {
settings->preconnection_id = preconnection_id;
guac_client_log(client, GUAC_LOG_DEBUG, guac_client_log(client, GUAC_LOG_DEBUG,
"Preconnection ID: %i", settings->preconnection_id); "Preconnection ID: %i", settings->preconnection_id);
} }
}
/* Preconnection BLOB */ /* Preconnection BLOB */
settings->preconnection_blob = NULL; settings->preconnection_blob = NULL;
if (argv[IDX_PRECONNECTION_BLOB][0] != '\0') { if (argv[IDX_PRECONNECTION_BLOB][0] != '\0') {