mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed drive redirection argument check

Browse Source 
Allow special cases '*' and '%' to pass parameter checks.
This commit is contained in:
akallabeth 2017-12-28 14:05:11 +01:00
parent 7c3d75bf1d
commit 27aac21c03
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/common/cmdline.c
View File

@ -400,7 +400,11 @@ BOOL freerdp_client_add_device_channel(rdpSettings* settings, int count,
if (count > 2) if (count > 2)
{ {
if (!PathFileExistsA(params[2]) || !(drive->Path = _strdup(params[2]))) const BOOL isPath = PathFileExistsA(params[2]);
const BOOL isSpecial = (strncmp(params[2], "*", 2) == 0) ||
(strncmp(params[2], "%", 2) == 0) ? TRUE : FALSE;
if ((!isPath && !isSpecial) || !(drive->Path = _strdup(params[2])))
{ {
free(drive->Name); free(drive->Name);
free(drive); free(drive);
@ -476,7 +480,6 @@ BOOL freerdp_client_add_device_channel(rdpSettings* settings, int count,
settings->RedirectSmartCards = TRUE; settings->RedirectSmartCards = TRUE;
settings->DeviceRedirection = TRUE; settings->DeviceRedirection = TRUE;
smartcard = (RDPDR_SMARTCARD*) calloc(1, sizeof(RDPDR_SMARTCARD)); smartcard = (RDPDR_SMARTCARD*) calloc(1, sizeof(RDPDR_SMARTCARD));
if (!smartcard) if (!smartcard)
@ -725,7 +728,8 @@ error_argv:
return FALSE; return FALSE;
} }
static char** freerdp_command_line_parse_comma_separated_values_ex(const char* name, const char* list, static char** freerdp_command_line_parse_comma_separated_values_ex(const char* name,
const char* list,
size_t* count) size_t* count)
{ {
char** p; char** p;
@ -757,7 +761,8 @@ static char** freerdp_command_line_parse_comma_separated_values_ex(const char* n
{ {
const char* it = list; const char* it = list;
while((it = strchr(it, ',')) != NULL)
while ((it = strchr(it, ',')) != NULL)
{ {
it++; it++;
nCommas++; nCommas++;
@ -1760,6 +1765,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
WLog_ERR(TAG, "Smart sizing and dynamic resolution are mutually exclusive options"); WLog_ERR(TAG, "Smart sizing and dynamic resolution are mutually exclusive options");
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
} }
settings->SupportDisplayControl = TRUE; settings->SupportDisplayControl = TRUE;
settings->DynamicResolutionUpdate = TRUE; settings->DynamicResolutionUpdate = TRUE;
} }