From df221e05bef598bb41f37dd4f495a5402c91b657 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 14 Jul 2015 10:49:06 -0700 Subject: [PATCH] GUAC-1171: RDP settings values may be NULL, and should not be used as defaults if NULL. --- src/protocols/rdp/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c index 03cef18a..3efd64a4 100644 --- a/src/protocols/rdp/client.c +++ b/src/protocols/rdp/client.c @@ -828,7 +828,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) { /* Parse username - use RDP username by default */ const char* sftp_username = argv[IDX_SFTP_USERNAME]; - if (sftp_username[0] == '\0') + if (sftp_username[0] == '\0' && settings->username != NULL) sftp_username = settings->username; guac_common_ssh_user* user = guac_common_ssh_create_user(sftp_username); @@ -855,7 +855,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) { /* Parse password - use RDP password by default */ const char* sftp_password = argv[IDX_SFTP_USERNAME]; - if (sftp_password[0] == '\0') + if (sftp_password[0] == '\0' && settings->password != NULL) sftp_password = settings->password; guac_common_ssh_user_set_password(user, sftp_password);